From b3898a597a2160ba2f1660b46edb8325a3e3f278 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 29 四月 2020 16:27:59 +0800
Subject: [PATCH] 修改考试/训练界面
---
app/src/main/res/values/strings.xml | 4
app/src/main/res/drawable/head_select2.png | 0
app/src/main/res/layout/layout_net_train.xml | 4
app/src/main/res/layout/profile_layout.xml | 74 ++++++++++++------------
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 21 ++++--
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 19 +++--
app/src/main/res/drawable/home_circle.png | 0
7 files changed, 66 insertions(+), 56 deletions(-)
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 4fcde0d..fdf4e1b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -103,8 +103,8 @@
private int item_id;//鎵ｅ垎鍒嗘暟鎬诲拰
private ExamStatusViewModel examStatusViewModel;
private static final int ADD_DATA = 1;
- private TextView tv_speed,tv_total_score,tv_name,tv_id,
- tv_start_time,tv_sex;
+ private TextView tv_speed,tv_total_score,tv_name,
+ tv_start_time,tv_coach_name;
private double speed=0.0;
private ImageView iv_head;
@@ -490,14 +490,12 @@
students) {
MyLog.i(TAG, "onChanged: " + student.toString());
if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){
-
- tv_name.setText(getString(R.string.name)+student.getName());
- tv_id.setText(getString(R.string.user_id)+student.getID());
+ tv_name.setText(getNameColor(student.getName()));
ExamPlatformData.getInstance().setId(student.getID());
- tv_sex.setText(getString(R.string.sex)+(student.getSex()==2?"濂�":"鐢�"));
tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
}else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
ExamPlatformData.getInstance().setCoachID(student.getID());
+ tv_coach_name.setText(getNameColor(student.getName()));
}
}
}
@@ -509,7 +507,13 @@
return view;
}
+ private SpannableString getNameColor(String str) {
+ SpannableString spannableString = new SpannableString(str);
+ spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#60FFFF")),0,
+ str.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ return spannableString;
+ }
private void initView(View view) {
@@ -540,9 +544,8 @@
av_zhijiao = view.findViewById(R.id.av4);
houseView = view.findViewById(R.id.hv);
tv_name = view.findViewById(R.id.tv_name);
- tv_id = view.findViewById(R.id.tv_ID);
+ tv_coach_name = view.findViewById(R.id.tv_coach_name);
tv_start_time = view.findViewById(R.id.tv_start_time);
- tv_sex = view.findViewById(R.id.tv_sex);
iv_head = view.findViewById(R.id.iv_head);
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index 7824ec4..67f0524 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -95,7 +95,6 @@
private int exam_type = 2;//2 鍦哄湴锛�3 閬撹矾锛屾ā鎷熷鑰冿紱4 閬撹矾锛屽疄闄呭鑰冿紱
private ListView mListView;
private Button btn_start_exam;
- private Button btn_return;
private TextView tv_stop;//鍛煎彨璇锋眰锛堢粨鏉熻�冭瘯锛�
private ScoreAdapter mScoreAdapter;
private Button av_zhijiao, av_curve, av_park, av_podao;
@@ -106,8 +105,8 @@
private int item_id;//鎵ｅ垎鍒嗘暟鎬诲拰
private ExamStatusViewModel examStatusViewModel;
private static final int ADD_DATA = 1;
- private TextView tv_speed,tv_total_score,tv_name,tv_id
- ,tv_start_time,tv_sex;
+ private TextView tv_speed,tv_total_score,tv_name
+ ,tv_start_time,tv_coach_name;
private double speed=0.0;
private ImageView iv_head;
WokViewModel wokViewModel;
@@ -478,14 +477,13 @@
MyLog.i(TAG, "onChanged: " + student.toString());
if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){
- tv_name.setText(getString(R.string.name)+student.getName());
- tv_id.setText(getString(R.string.user_id)+student.getID());
+ tv_name.setText(getNameColor(student.getName()));
ExamPlatformData.getInstance().setId(student.getID());
- tv_sex.setText(getString(R.string.sex)+(student.getSex()==2?"濂�":"鐢�"));
tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
}else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
ExamPlatformData.getInstance().setCoachID(student.getID());
+ tv_coach_name.setText(getNameColor(student.getName()));
}
}
}
@@ -526,9 +524,8 @@
av_zhijiao = view.findViewById(R.id.av4);
houseView = view.findViewById(R.id.hv);
tv_name = view.findViewById(R.id.tv_name);
- tv_id = view.findViewById(R.id.tv_ID);
+ tv_coach_name = view.findViewById(R.id.tv_coach_name);
tv_start_time = view.findViewById(R.id.tv_start_time);
- tv_sex = view.findViewById(R.id.tv_sex);
iv_head = view.findViewById(R.id.iv_head);
tv_speed = view.findViewById(R.id.tv_speed);
@@ -725,4 +722,12 @@
((MainActivity)_mActivity).viewtitle.setVisibility(View.GONE);
((MainActivity)_mActivity).btn_return.setVisibility(View.GONE);
}
+ private SpannableString getNameColor(String str) {
+ SpannableString spannableString = new SpannableString(str);
+ spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#60FFFF")),0,
+ str.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+ return spannableString;
+ }
+
}
diff --git a/app/src/main/res/drawable/head_select2.png b/app/src/main/res/drawable/head_select2.png
new file mode 100755
index 0000000..20c824f
--- /dev/null
+++ b/app/src/main/res/drawable/head_select2.png
Binary files differ
diff --git a/app/src/main/res/drawable/home_circle.png b/app/src/main/res/drawable/home_circle.png
index 4b6eea8..ab64f2b 100755
--- a/app/src/main/res/drawable/home_circle.png
+++ b/app/src/main/res/drawable/home_circle.png
Binary files differ
diff --git a/app/src/main/res/layout/layout_net_train.xml b/app/src/main/res/layout/layout_net_train.xml
index 3e1e14a..1ea7818 100644
--- a/app/src/main/res/layout/layout_net_train.xml
+++ b/app/src/main/res/layout/layout_net_train.xml
@@ -41,13 +41,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/tv_speed"
- android:id="@+id/tv_pos"
+ android:id="@+id/tv_start_time"
android:padding="10dp"
android:gravity="center"
android:textColor="#A1A1A3"
android:layout_alignParentEnd="true"
android:layout_marginRight="16dp"
- android:text="@string/licheng"/>
+ android:text="@string/begin_time"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/profile_layout.xml b/app/src/main/res/layout/profile_layout.xml
index e1bbeff..93d32d4 100644
--- a/app/src/main/res/layout/profile_layout.xml
+++ b/app/src/main/res/layout/profile_layout.xml
@@ -11,58 +11,60 @@
android:background="@drawable/stu_score_bg"
>
- <ImageView
- android:id="@+id/iv_head"
- android:layout_width="0dp"
- android:layout_height="90dp"
- android:layout_weight="1"
- android:scaleType="fitCenter"
- android:layout_gravity="center_vertical"
- android:src="@drawable/head_select1" />
+
<LinearLayout
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="105dp"
- android:layout_weight="2"
+ android:paddingTop="@dimen/ui_margin_10dp"
+ android:gravity="center"
+ android:layout_weight="1"
android:orientation="vertical">
- <TextView
- android:id="@+id/tv_name"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_toRightOf="@+id/iv_head"
- style="@style/ui_exam_font"
- android:text="@string/name"
- android:layout_weight="1"
- android:textColor="@android:color/white" />
- <TextView
- android:id="@+id/tv_sex"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:layout_marginRight="10dp"
- android:layout_toRightOf="@+id/tv_name"
- style="@style/ui_exam_font"
- android:text="@string/sex"
- android:textColor="@android:color/white" />
+ <safeluck.drive.evaluation.customview.CircleImageView
+ android:id="@+id/iv_head"
+ android:layout_width="73dp"
+ android:layout_height="73dp"
+ android:src="@drawable/head_select1" />
+
<TextView
- android:id="@+id/tv_ID"
- android:layout_width="wrap_content"
+ android:id="@+id/tv_name"
+ android:layout_width="73dp"
android:layout_height="0dp"
- android:layout_below="@+id/tv_name"
android:layout_weight="1"
- android:text="@string/user_id"
+ android:gravity="center"
+ android:text="@string/name"
style="@style/ui_exam_font"
android:textColor="@android:color/white" />
+
+
+
+</LinearLayout>
+<LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="105dp"
+ android:gravity="center"
+ android:layout_weight="1"
+ android:paddingTop="@dimen/ui_margin_10dp"
+ android:orientation="vertical">
+ <safeluck.drive.evaluation.customview.CircleImageView
+ android:id="@+id/iv_coach_head"
+ android:layout_width="73dp"
+ android:layout_height="73dp"
+ android:src="@drawable/head_select2" />
+
+
<TextView
- android:id="@+id/tv_start_time"
- android:layout_width="wrap_content"
+ android:id="@+id/tv_coach_name"
+ android:layout_width="73dp"
android:layout_height="0dp"
android:layout_weight="1"
- android:text="@string/begin_time"
+ android:gravity="center"
+ android:text="@string/name1"
style="@style/ui_exam_font"
android:textColor="@android:color/white" />
+
</LinearLayout>
</LinearLayout>
<LinearLayout android:layout_width="166dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ebcefc2..87f2c9f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,10 +25,10 @@
<string name="rtk_connect_status">RTK杩炴帴鐘舵�侊細%1$d</string>
<string name="rtk_config_login">RTK鐧诲綍缁撴灉锛�%1$d</string>
<string name="speed">杞﹂��:%1$.2fkm/h</string>
- <string name="licheng">宸茶椹�:451km</string>
<string name="total_score">%1$d鍒�</string>
<string name="sat_num">鍗槦鏁伴噺</string>
- <string name="name">濮撳悕锛�</string>
+ <string name="name">瀛﹀憳</string>
+ <string name="name1">鏁欑粌</string>
<string name="sex">鎬у埆锛�</string>
<string name="begin_time">寮�濮嬫椂闂达細</string>
<string name="mcu_info">鍗忓鐞嗗櫒淇℃伅锛�</string>
--
Gitblit v1.8.0