From 705d8e58aa6f13bf6883a7116c7de0edfa1567a6 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 21 四月 2020 10:50:34 +0800
Subject: [PATCH] 修改联网考试细节ui；基本完成参数设置界面
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 117 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 65 insertions(+), 52 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 52b9441..e477a6b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -1,12 +1,17 @@
package safeluck.drive.evaluation.fragment;
import android.content.Context;
+import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.text.SpannableString;
+import android.text.Spanned;
import android.text.TextUtils;
+import android.text.style.AbsoluteSizeSpan;
+import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -86,10 +91,9 @@
private ListView mListView;
private Button btn_start_exam;
private TextView tv_stop;//鍛煎彨璇锋眰锛堢粨鏉熻�冭瘯锛�
- private Gson gson = new Gson();
private ScoreAdapter mScoreAdapter;
- private ArrowView av_zhijiao, av_curve, av_park, av_podao;
- private HouseView houseView;
+ private Button av_zhijiao, av_curve, av_park, av_podao;
+ private Button houseView;
private List<ExamStatus> examStatusList = new ArrayList<>();
private List<String> item_conents = new ArrayList<>();//鍧￠亾瀹氱偣鍋滆溅鍜岃捣姝�
private int changKaoCount=0;
@@ -122,12 +126,12 @@
public boolean handleMessage(Message msg) {
if (msg.what == ADD_DATA){
MyLog.i("handler add_data totalScore="+currTotalScore);
- tv_total_score.setText(getResources().getString(R.string.total_score,currTotalScore));
- houseView.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_REVERSE));//鍊掕溅鍏ュ簱 type =1
- av_podao.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_RAMP));
- av_park.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_PARK));
- av_curve.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_CURVE));
- av_zhijiao.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_ANGLE));
+ setTotalScoreText();
+ houseView.setBackground(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_REVERSE));//鍊掕溅鍏ュ簱 type =1
+ av_podao.setBackground(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_RAMP));
+ av_park.setBackground(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_PARK));
+ av_curve.setBackground(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_CURVE));
+ av_zhijiao.setBackground(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_ANGLE));
for (int i = 0; i < btn_ids.size(); i++) {
int viewId = getResources().getIdentifier(String.valueOf(btn_ids.get(i)),"id",_mActivity.getPackageName());
@@ -163,27 +167,27 @@
}
});
- private int aaa(int type) {
+ private Drawable aaa(int type) {
if (examStatusList!=null &&examStatusList.size()>0){
for (ExamStatus examStatus:
- examStatusList) {
+ examStatusList) {
if (type == examStatus.getMap_item()){
if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.BEGIN_ITEM){
//杩涘叆鑰冨満
if (examStatusList.get(0).getStartExam() == Constant.NONE_BEEN_START_EXAM){
//缁撴潫鑰冭瘯浜�
MyLog.i("杩涘叆鑰冨満缁撴潫鑰冭瘯锛宻tartexam="+examStatus.getStartExam());
- return getResources().getColor(R.color.colorAccent);
+ return getResources().getDrawable(R.drawable.ic_btn_fail);
}else{
MyLog.i("杩涘叆鑰冨満锛宼ype="+type);
- return getResources().getColor(R.color.pink);
+ return getResources().getDrawable(R.drawable.ic_btn_examing);
}
}else if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.FINISH_ITEM){
if (examStatusList.get(0).getStartExam()==Constant.NONE_BEEN_START_EXAM){
- return getResources().getColor(R.color.examing);
+ return getResources().getDrawable(R.drawable.ic_btn_daikao);
}
switch (type) {
@@ -191,7 +195,7 @@
if (item_conents.contains("鍊掕溅鍏ュ簱")) {
MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
- return getResources().getColor(R.color.colorAccent);
+ return getResources().getDrawable(R.drawable.ic_btn_fail);
}else{
if (examStatus.getResult() ==1){
MyLog.i("宸茬粡鎾斁杩囧�掕溅鍏ュ簱鍚堟牸");
@@ -200,12 +204,12 @@
examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
}
- return getResources().getColor(R.color.train_btn_return);
+ return getResources().getDrawable(R.drawable.ic_btn_succ);
}
case 2:
if (item_conents.contains("鍧￠亾瀹氱偣鍋滆溅鍜岃捣姝�")) {
MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
- return getResources().getColor(R.color.colorAccent);
+ return getResources().getDrawable(R.drawable.ic_btn_fail);
}else{
if (examStatus.getResult() ==1){
MyLog.i("宸茬粡鎾斁杩囧潯閬撳畾鐐瑰仠杞﹀拰璧锋鍚堟牸鍚堟牸");
@@ -214,12 +218,12 @@
examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
}
- return getResources().getColor(R.color.train_btn_return);
+ return getResources().getDrawable(R.drawable.ic_btn_succ);
}
case 3:
if (item_conents.contains("渚ф柟鍋滆溅")) {
MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
- return getResources().getColor(R.color.colorAccent);
+ return getResources().getDrawable(R.drawable.ic_btn_fail);
}else{
if (examStatus.getResult() ==1){
MyLog.i("宸茬粡鎾斁杩囦晶鏂瑰仠杞﹀悎鏍�");
@@ -228,12 +232,12 @@
ExamPlatformData.getInstance().getTTS().speak("渚ф柟鍋滆溅鍚堟牸");
examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
}
- return getResources().getColor(R.color.train_btn_return);
+ return getResources().getDrawable(R.drawable.ic_btn_succ);
}
case 4:
if (item_conents.contains("鏇茬嚎琛岄┒")) {
MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
- return getResources().getColor(R.color.colorAccent);
+ return getResources().getDrawable(R.drawable.ic_btn_fail);
}else{
if (examStatus.getResult() ==1){
MyLog.i("宸茬粡鎾斁杩囨洸绾胯椹跺悎鏍�");
@@ -242,12 +246,12 @@
ExamPlatformData.getInstance().getTTS().speak("鏇茬嚎琛岄┒鍚堟牸");
examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
}
- return getResources().getColor(R.color.train_btn_return);
+ return getResources().getDrawable(R.drawable.ic_btn_succ);
}
case 5:
if (item_conents.contains("鐩磋杞集")) {
MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
- return getResources().getColor(R.color.colorAccent);
+ return getResources().getDrawable(R.drawable.ic_btn_fail);
}else{
if (examStatus.getResult() ==1){
MyLog.i("宸茬粡鎾斁杩囩洿瑙掕浆寮悎鏍�");
@@ -256,7 +260,7 @@
examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
}
- return getResources().getColor(R.color.train_btn_return);
+ return getResources().getDrawable(R.drawable.ic_btn_succ);
}
@@ -264,13 +268,14 @@
}
}else{
- return getResources().getColor(R.color.examing);
+ return getResources().getDrawable(R.drawable.ic_btn_daikao);
}
}
}
}
- return getResources().getColor(R.color.examing);
+ return getResources().getDrawable(R.drawable.ic_btn_daikao);
}
+
/**
* 璺�冮」鐩� 姣忎釜椤圭洰鐨勯鑹插彉鍖�
* @param type
@@ -463,12 +468,10 @@
examStatusList.addAll(examStatus);
mHandler.obtainMessage(ADD_DATA).sendToTarget();
if (examStatus.get(0).getStartExam() != Constant.NONE_BEEN_START_EXAM){
- btn_start_exam.setEnabled(false);
- tv_stop.setEnabled(true);
+ btn_start_exam.setText("缁撴潫鑰冭瘯");
iv_head.getDrawable().setLevel(1);
}else{
- btn_start_exam.setEnabled(true);
- tv_stop.setEnabled(false);
+ btn_start_exam.setText("寮�濮嬭�冭瘯");
iv_head.getDrawable().setLevel(0);
}
exam_type = examStatus.get(0).getStartExam();
@@ -541,6 +544,7 @@
btn_ids.add(R.id.btn_10);
view.findViewById(R.id.iv_head).setOnClickListener(this);
+ ((TextView)view.findViewById(R.id.tv_score_tip)).setText("褰撳墠鑰冭瘯寰楀垎");
av_curve = view.findViewById(R.id.av3);
av_park = view.findViewById(R.id.av2);
av_podao = view.findViewById(R.id.av1);
@@ -598,36 +602,37 @@
public void onClick(View v) {
switch (v.getId()) {
case R.id.btn_start:
-
- clearArrayListResetTotalScore();
+ if (btn_start_exam.getText().toString().equalsIgnoreCase("寮�濮嬭�冭瘯")){
+ clearArrayListResetTotalScore();
- if (myDialogFragment == null){
- myDialogFragment = new MyDialogFragment();
+ if (myDialogFragment == null){
+ myDialogFragment = new MyDialogFragment();
+ }
+ myDialogFragment.show(getFragmentManager(),"dialog");
+ myDialogFragment.setCallback(new MyDialogFragment.Callback() {
+ @Override
+ public void changKao() {
+ sendJK0202(2);
+ }
+
+ @Override
+ public void luKao() {
+ sendJK0202(3);
+
+ }
+ });
+
+ }else{
+ stopExam();
}
- myDialogFragment.show(getFragmentManager(),"dialog");
- myDialogFragment.setCallback(new MyDialogFragment.Callback() {
- @Override
- public void changKao() {
- sendJK0202(2);
- }
-
- @Override
- public void luKao() {
- sendJK0202(3);
-
- }
- });
break;
- case R.id.tv_stop:
- Toast.makeText(_mActivity, "缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
- stopExam();
- break;
+
case R.id.view_map:
if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
@@ -717,7 +722,7 @@
item_id = 0;
failedProjViewModel.deleteAll();
- tv_total_score.setText(String.valueOf(currTotalScore));
+ setTotalScoreText();
ExamPlatformData.getInstance().getTTS().speak("缁撴潫鑰冭瘯");
@@ -764,5 +769,13 @@
CEventCenter.onBindEvent(false,icEventListener,Constant.BIND_SPEED_TOPIC);
}
+ private void setTotalScoreText() {
+ String totalstr=String.format(getString(R.string.total_score),currTotalScore);
+ SpannableString msp = new SpannableString(totalstr);
+ msp.setSpan(new ForegroundColorSpan(Color.parseColor("#A1A1A3")),totalstr.length()-1,totalstr.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ msp.setSpan(new AbsoluteSizeSpan(13),totalstr.length()-1,totalstr.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+ tv_total_score.setText(msp);
+ }
}
--
Gitblit v1.8.0