From 656d35e6a54a89caa549412c6f0f4635985f4153 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期四, 21 三月 2019 10:31:45 +0800
Subject: [PATCH] 完善驾校信息页
---
app/src/main/java/safeluck/drive/evaluation/fragment/BaseSettingFragment.java | 65 +++++++
app/src/main/res/values/styles.xml | 5
app/src/main/java/safeluck/drive/evaluation/fragment/VPFragment.java | 45 +++++
app/src/main/res/values/strings.xml | 4
app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java | 38 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/SingleJudgeFragment.java | 40 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/SysSettingFragment.java | 73 ++++++++
app/src/main/java/safeluck/drive/evaluation/adapter/MyFragmetAdapter.java | 48 +++++
app/src/main/res/layout/layout_train_fragment.xml | 22 ++
app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java | 5
app/src/main/res/layout/layout_ftp_setting.xml | 6
app/src/main/res/layout/layout_base_set.xml | 31 +++
app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png | 0
app/src/main/res/layout/layout_sys_setting.xml | 37 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 2
app/src/main/res/layout/layout_jiaxiao_info.xml | 115 ++++++++++++
16 files changed, 531 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/adapter/MyFragmetAdapter.java b/app/src/main/java/safeluck/drive/evaluation/adapter/MyFragmetAdapter.java
new file mode 100644
index 0000000..fd10d36
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/adapter/MyFragmetAdapter.java
@@ -0,0 +1,48 @@
+package safeluck.drive.evaluation.adapter;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+
+import me.yokeyword.fragmentation.SupportFragment;
+import safeluck.drive.evaluation.fragment.BaseSettingFragment;
+import safeluck.drive.evaluation.fragment.SingleJudgeFragment;
+import safeluck.drive.evaluation.fragment.VPFragment;
+
+/**
+ * MyApplication2
+ * Created by lzw on 2019/3/19. 16:50:38
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class MyFragmetAdapter extends FragmentPagerAdapter {
+
+ private String[] mTitles = new String[]{"鍩烘湰璁剧疆","淇″彿璇勫垽"};
+
+ public MyFragmetAdapter(FragmentManager fm) {
+ super(fm);
+ }
+
+ @Override
+ public SupportFragment getItem(int i) {
+ if(i==0){
+ return BaseSettingFragment.newInstance();
+ }else{
+
+ return SingleJudgeFragment.newInstance();
+ }
+ }
+
+ @Override
+ public int getCount() {
+ return 2;
+ }
+
+ @Nullable
+ @Override
+ public CharSequence getPageTitle(int position) {
+ return mTitles[position];
+ }
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java b/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java
new file mode 100644
index 0000000..ba5e9a8
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/adapter/SimpleFragmentAdapter.java
@@ -0,0 +1,38 @@
+package safeluck.drive.evaluation.adapter;
+
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+
+import safeluck.drive.evaluation.fragment.VPFragment;
+
+/**
+ * MyApplication2
+ * Created by lzw on 2019/3/20. 15:26:26
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class SimpleFragmentAdapter extends FragmentPagerAdapter {
+ private String[] mTitles = new String[]{"鍩虹鏁版嵁","FTP閰嶇疆","椹炬牎淇℃伅"};
+ public SimpleFragmentAdapter(FragmentManager fm) {
+ super(fm);
+ }
+
+ @Override
+ public Fragment getItem(int i) {
+ return VPFragment.newInstance(mTitles[i]);
+ }
+
+ @Override
+ public int getCount() {
+ return mTitles.length;
+ }
+
+ @Nullable
+ @Override
+ public CharSequence getPageTitle(int position) {
+ return mTitles[position];
+ }
+}
+
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseSettingFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseSettingFragment.java
new file mode 100644
index 0000000..fbe1f89
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseSettingFragment.java
@@ -0,0 +1,65 @@
+package safeluck.drive.evaluation.fragment;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import me.yokeyword.fragmentation.SupportFragment;
+import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.adapter.MyFragmetAdapter;
+import safeluck.drive.evaluation.adapter.SimpleFragmentAdapter;
+
+/**
+ * MyApplication2
+ * Created by lzw on 2019/3/20. 11:19:26
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class BaseSettingFragment extends SupportFragment {
+
+ private ViewPager viewPager;
+ private TabLayout tabLayout;
+ private SimpleFragmentAdapter myFragmetAdapter;
+
+ public static SupportFragment newInstance(){
+ return new BaseSettingFragment();
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ View view = inflater.inflate(R.layout.layout_base_set,container,false);
+ initView(view);
+ return view;
+
+ }
+
+ private void initView(View view) {
+ tabLayout = view.findViewById(R.id.tab_base_set);
+ viewPager = view.findViewById(R.id.vp_base_set);
+ tabLayout.setTabMode(TabLayout.MODE_FIXED);
+ tabLayout.addTab(tabLayout.newTab());
+ tabLayout.addTab(tabLayout.newTab());
+ }
+
+ @Override
+ public void onLazyInitView(@Nullable Bundle savedInstanceState) {
+ myFragmetAdapter = new SimpleFragmentAdapter(this.getChildFragmentManager());
+ viewPager.setAdapter(myFragmetAdapter);
+ tabLayout.setupWithViewPager(viewPager);
+
+ }
+
+
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
index fde4d19..d008ea2 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
@@ -83,6 +83,11 @@
break;
case R.id.system_setting:
+ SysSettingFragment sysSetingFragment = findFragment(SysSettingFragment.class);
+ if (sysSetingFragment == null){
+ sysSetingFragment = (SysSettingFragment) SysSettingFragment.newInstance();
+ }
+ start(sysSetingFragment);
break;
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index fc7981f..abc53ff 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -38,7 +38,7 @@
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.layout_stu_score,container,false);
+ View view = inflater.inflate(R.layout.layout_train_fragment,container,false);
initView(view);
return view;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/SingleJudgeFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/SingleJudgeFragment.java
new file mode 100644
index 0000000..a843806
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SingleJudgeFragment.java
@@ -0,0 +1,40 @@
+package safeluck.drive.evaluation.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import me.yokeyword.fragmentation.SupportFragment;
+import safeluck.drive.evaluation.R;
+
+/**淇″彿璇勫垽UI
+ * MyApplication2
+ * Created by lzw on 2019/3/20. 11:22:39
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class SingleJudgeFragment extends SupportFragment {
+ public static SupportFragment newInstance(){
+ return new SingleJudgeFragment();
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+// TextView textView = new TextView(_mActivity);
+// ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+// textView.setGravity(Gravity.CENTER);
+// textView.setLayoutParams(layoutParams);
+//
+// textView.setText("淇″彿璇勫垽");
+// return textView;
+
+ View view = inflater.inflate(R.layout.layout_jiaxiao_info,container,false);
+ return view;
+ }
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/SysSettingFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/SysSettingFragment.java
new file mode 100644
index 0000000..0bd1a6a
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SysSettingFragment.java
@@ -0,0 +1,73 @@
+package safeluck.drive.evaluation.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewPager;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import me.yokeyword.fragmentation.SupportFragment;
+import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.adapter.MyFragmetAdapter;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+
+/**
+ * MyApplication2
+ * Created by lzw on 2019/3/15. 14:32:50
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class SysSettingFragment extends SupportFragment {
+
+ private ViewPager viewPager;
+ private TabLayout tabLayout;
+ private MyFragmetAdapter myFragmetAdapter;
+ private Toolbar tb;
+
+ public static SupportFragment newInstance(){
+ return new SysSettingFragment();
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ View view = inflater.inflate(R.layout.layout_sys_setting,container,false);
+ initView(view);
+ return view;
+ }
+
+ private void initView(View view) {
+ tabLayout = view.findViewById(R.id.tab);
+ tabLayout.setTabMode(TabLayout.MODE_FIXED);
+ tabLayout.addTab(tabLayout.newTab());
+ tabLayout.addTab(tabLayout.newTab());
+ tb = view.findViewById(R.id.toolbar);
+ tb.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp);
+ tb.setNavigationOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ _mActivity.onBackPressed();
+ }
+ });
+ tb.setTitle(R.string.sys_setting);
+ tb.setSubtitle(R.string.sys_setting_sub);
+ viewPager = view.findViewById(R.id.vp);
+
+
+ }
+
+ @Override
+ public void onLazyInitView(@Nullable Bundle savedInstanceState) {
+ super.onLazyInitView(savedInstanceState);
+ myFragmetAdapter = new MyFragmetAdapter(getChildFragmentManager());
+ viewPager.setAdapter(myFragmetAdapter);
+ tabLayout.setupWithViewPager(viewPager);
+ }
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/VPFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/VPFragment.java
new file mode 100644
index 0000000..cc17118
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/VPFragment.java
@@ -0,0 +1,45 @@
+package safeluck.drive.evaluation.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import me.yokeyword.fragmentation.SupportFragment;
+
+/**
+ * MyApplication2
+ * Created by lzw on 2019/3/19. 16:55:04
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class VPFragment extends SupportFragment {
+
+ public static SupportFragment newInstance(String s){
+ VPFragment vpFragment = new VPFragment();
+ Bundle bundle = new Bundle();
+ bundle.putString("argu",s);
+ vpFragment.setArguments(bundle);
+ return vpFragment;
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ TextView textView = new TextView(_mActivity);
+ ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+ textView.setGravity(Gravity.CENTER);
+ textView.setLayoutParams(layoutParams);
+ Bundle bundle = getArguments();
+ if (bundle != null){
+
+ textView.setText(bundle.getString("argu"));
+ }else
+ textView.setText("kong");
+ return textView;
+ }
+}
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 0000000..0e43ff9
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/layout/layout_base_set.xml b/app/src/main/res/layout/layout_base_set.xml
new file mode 100644
index 0000000..050cd99
--- /dev/null
+++ b/app/src/main/res/layout/layout_base_set.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+<android.support.design.widget.TabLayout
+ android:layout_width="match_parent"
+ android:layout_height="45dp"
+android:background="@color/colorAccent"
+ android:id="@+id/tab_base_set">
+ <android.support.design.widget.TabItem
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍩虹鏁版嵁" />
+
+ <android.support.design.widget.TabItem
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="FTP閰嶇疆" />
+ <android.support.design.widget.TabItem
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="椹炬牎淇℃伅" />
+</android.support.design.widget.TabLayout>
+ <android.support.v4.view.ViewPager
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/vp_base_set">
+
+ </android.support.v4.view.ViewPager>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_ftp_setting.xml b/app/src/main/res/layout/layout_ftp_setting.xml
new file mode 100644
index 0000000..f9504c9
--- /dev/null
+++ b/app/src/main/res/layout/layout_ftp_setting.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_jiaxiao_info.xml b/app/src/main/res/layout/layout_jiaxiao_info.xml
new file mode 100644
index 0000000..9cb8405
--- /dev/null
+++ b/app/src/main/res/layout/layout_jiaxiao_info.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+
+ android:padding="10dp">
+<TableRow>
+ <TextView
+ android:id="@+id/tv_d"
+ style="@style/jiaxiao_info_text"
+ android:text="椹炬牎鍚嶇О锛�"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="娑￠槼椹炬牎"
+ android:background="@android:drawable/edit_text"/>
+ <TextView
+ style="@style/jiaxiao_info_text"
+ android:text="鍑嗛┚杞﹀瀷锛�"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="C1"
+ android:background="@android:drawable/edit_text"/>
+ <TextView
+ style="@style/jiaxiao_info_text"
+ android:text="涓氬姟绫诲瀷锛�"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="鍒濇鐢抽"
+ android:background="@android:drawable/edit_text"/>
+
+</TableRow>
+ <TableRow>
+ <TextView
+ style="@style/jiaxiao_info_text"
+ android:text="棰勭害娆℃暟锛�"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="绗竴娆�"
+ android:background="@android:drawable/edit_text"/>
+ <TextView
+ style="@style/jiaxiao_info_text"
+ android:text="杞︾墝鍙凤細"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="娓滲1260瀛�"
+ android:background="@android:drawable/edit_text"/>
+ <TextView
+ style="@style/jiaxiao_info_text"
+ android:text="鑰冭瘯缃戠偣锛�"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="235689554"
+ android:background="@android:drawable/edit_text"/>
+
+</TableRow><TableRow>
+ <TextView
+ style="@style/jiaxiao_info_text"
+ android:text="鑰冭瘯绉戠洰锛�"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="绉戠洰浜�"
+ android:background="@android:drawable/edit_text"/>
+ <TextView
+ style="@style/jiaxiao_info_text"
+ android:text="鑰冨満鍚嶇О锛�"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="娑￠槼椹炬牎"
+ android:background="@android:drawable/edit_text"/>
+ <TextView
+ style="@style/jiaxiao_info_text"
+ android:text="鑰冭瘯鍦扮偣锛�"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="5445687"
+ android:background="@android:drawable/edit_text"/>
+
+</TableRow>
+ <TableRow>
+ <TextView
+ style="@style/jiaxiao_info_text"
+ android:text="鑰冨満搴忓彿锛�"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="绉戠洰浜�"
+ android:background="@android:drawable/edit_text"/>
+ <TextView
+ style="@style/jiaxiao_info_text"
+ android:text="@string/on_board_sn"/>
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="娑￠槼椹炬牎"
+ android:background="@android:drawable/edit_text"/>
+
+
+ </TableRow>
+ <TableRow android:gravity="center_horizontal">
+ <Button android:id="@+id/btn_save_jiaxiao_info"
+ android:text="@string/save"
+ android:textSize="18sp"
+ android:background="@android:drawable/btn_default_small"
+ android:padding="10dp"/>
+ </TableRow>
+</TableLayout>
diff --git a/app/src/main/res/layout/layout_sys_setting.xml b/app/src/main/res/layout/layout_sys_setting.xml
new file mode 100644
index 0000000..5e5e7fa
--- /dev/null
+++ b/app/src/main/res/layout/layout_sys_setting.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <android.support.design.widget.AppBarLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:theme="@style/AppTheme.AppBarOverlay">
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay"
+ app:titleTextAppearance="@style/Toolbar_TextAppearance_White"/>
+ <android.support.design.widget.TabLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tab"
+
+ android:background="@color/profile_bg"
+ android:layout_below="@+id/toolbar_set">
+ </android.support.design.widget.TabLayout>
+ </android.support.design.widget.AppBarLayout>
+
+ <android.support.v4.view.ViewPager
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/vp"></android.support.v4.view.ViewPager>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_train_fragment.xml b/app/src/main/res/layout/layout_train_fragment.xml
index 04a9e57..8489c27 100644
--- a/app/src/main/res/layout/layout_train_fragment.xml
+++ b/app/src/main/res/layout/layout_train_fragment.xml
@@ -1,9 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/home_bg_color">
-<include android:layout_marginBottom="10dp" android:layout_weight="1" android:layout_width="match_parent" android:layout_height="0dp" android:id="@+id/profile" layout="@layout/profile_layout"/>
-<include android:layout_marginBottom="10dp" android:layout_weight="1.5" android:layout_width="match_parent" android:layout_height="0dp" android:id="@+id/profile" layout="@layout/layout_net_train"/>
-</LinearLayout>
\ No newline at end of file
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/ll"
+ android:orientation="vertical">
+ <include android:layout_marginBottom="10dp" android:layout_width="match_parent" android:layout_height="120dp" android:id="@+id/profile" layout="@layout/profile_layout"/>
+ <include android:layout_marginBottom="10dp" android:layout_width="match_parent" android:layout_height="170dp" layout="@layout/layout_net_train"/>
+
+ <include android:layout_marginBottom="10dp" android:layout_width="match_parent" android:layout_height="240dp" layout="@layout/layout_stu_score"/>
+ </LinearLayout>
+
+
+
+
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7362fde..ce9009b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,4 +7,8 @@
<string name="version_name">v3.1</string>
<string name="user_id">韬唤璇佸彿:                </string>
<string name="inspector">鑰冩牳鍛樼紪鍙�:</string>
+ <string name="sys_setting">绯荤粺閰嶇疆</string>
+ <string name="sys_setting_sub">鏅鸿兘鑰冨煿锛屽姪鍔涢┚鑰冩柊鏃呯▼</string>
+ <string name="save">淇濆瓨</string>
+ <string name="on_board_sn">杞﹁浇璁惧鍙凤細</string>
</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 227127b..c22fc28 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -42,4 +42,9 @@
<item name="android:layout_marginTop">10dp</item>
</style>
+ <style name="jiaxiao_info_text" parent="home_fragment_text">
+ <item name="android:textColor">@android:color/black</item>
+ <item name="android:textSize">20sp</item>
+ </style>
+
</resources>
--
Gitblit v1.8.0