app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/drawable/head_select2.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/drawable/home_circle.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/layout_net_train.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/profile_layout.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/values/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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); 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; } } app/src/main/res/drawable/head_select2.png
app/src/main/res/drawable/home_circle.pngapp/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" 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" 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>