From 8db39e85a21a5ccf5325172025b5aabf970c64fe Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 23 三月 2020 15:07:01 +0800
Subject: [PATCH] 训练模式科三
---
app/src/main/java/safeluck/drive/evaluation/app.java | 1
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 11 ++-
app/src/main/java/safeluck/drive/evaluation/platformMessage/PlatFormConstant.java | 1
app/src/main/res/layout/layout_road_train.xml | 38 +++++++-----
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 73 +++++++++++++++++++++++-
5 files changed, 100 insertions(+), 24 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index f926d00..2eb2a77 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -247,6 +247,7 @@
type = rtkConfigUpdtea.getInt("type");
enter_status = rtkConfigUpdtea.getInt("enter");
String itemstr=ExamPlatformData.getInstance().getItemStatusStr(type);
+ MyLog.i(PlatFormConstant.LUKAO,String.format("%s",itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"缁撴潫":"寮�濮�")));
if (ExamPlatformData.getInstance().getTrainingMode()== ExamPlatformData.TRAINING_MODE){
ExamPlatformData.getInstance().getTTS().speak(itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"缁撴潫":"寮�濮�"));
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
index 602ef14..bd260cf 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -79,12 +79,12 @@
enter_exit_item_tts.put(5,"鐩磋杞集");
enter_exit_item_tts.put(101,"鐩寸嚎琛岄┒");
- enter_exit_item_tts.put(102,"鍔犲噺妗�");
+ enter_exit_item_tts.put(102,"鍔犲噺鎸′綅鎿嶄綔");
enter_exit_item_tts.put(103,"闈犺竟鍋滆溅");
enter_exit_item_tts.put(104,"鐩磋閫氳繃璺彛");
- enter_exit_item_tts.put(105,"宸﹁浆寮�");
- enter_exit_item_tts.put(106,"鍙宠浆寮�");
- enter_exit_item_tts.put(107,"閫氳繃浜鸿妯亾");
+ enter_exit_item_tts.put(105,"璺彛宸﹁浆寮�");
+ enter_exit_item_tts.put(106,"璺彛鍙宠浆寮�");
+ enter_exit_item_tts.put(107,"閫氳繃浜鸿閬撴í绾�");
enter_exit_item_tts.put(108,"閫氳繃瀛︽牎鍖哄煙");
enter_exit_item_tts.put(109,"閫氳繃鍏叡姹借溅绔�");
enter_exit_item_tts.put(110,"鎺夊ご");
@@ -260,7 +260,8 @@
* @return
*/
public String getItemStatusStr(int item) {
- if (item<1 || item>enter_exit_item_tts.size()){
+
+ if (enter_exit_item_tts.get(item)==null){
return "鏈煡椤圭洰";
}
return enter_exit_item_tts.get(item);
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 36e4528..9ccbf39 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -124,6 +124,8 @@
private List<SimulateNightBean.QuestionBean> tempQs= new ArrayList<>();
private TableRow tableRow1,tableRow2,tableRow3;
+ private Button btn_1,btn_2;
+private List<Integer> btn_ids = new ArrayList<Integer>();
private Handler mHandler = new Handler(new Handler.Callback() {
@Override
@@ -136,6 +138,11 @@
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));
+
+ for (int i = 0; i < btn_ids.size(); i++) {
+ int viewId = getResources().getIdentifier(String.valueOf(btn_ids.get(i)),"id",_mActivity.getPackageName());
+ ((Button) view.findViewById(viewId)).setBackgroundColor(100+i+1);
+ }
}
if (msg.what == SPEED_DATA){
tv_speed.setText(_mActivity.getApplicationContext().getResources().getString(R.string.speed,speed));
@@ -276,6 +283,58 @@
return getResources().getColor(R.color.examing);
}
+ /**
+ * 璺�冮」鐩� 姣忎釜椤圭洰鐨勯鑹插彉鍖�
+ * @param type
+ * @return
+ */
+ private int bbb(int type) {
+ if (examStatusList!=null &&examStatusList.size()>0){
+ for (ExamStatus examStatus:
+ 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);
+ }else{
+ MyLog.i("杩涘叆鑰冨満锛宼ype="+type);
+ return getResources().getColor(R.color.pink);
+ }
+
+
+ }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);
+ }
+ String ss=ExamPlatformData.getInstance().getItemStatusStr(type);
+ if (item_conents.contains(ss)) {
+ MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
+
+ return getResources().getColor(R.color.colorAccent);
+ }else{
+ if (examStatus.getResult() ==1){
+ MyLog.i(String.format("宸茬粡鎾斁杩�%s鍚堟牸",ss));
+ }else{
+ ExamPlatformData.getInstance().getTTS().speak(String.format("%s鍚堟牸",ss));
+ examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
+ }
+
+ return getResources().getColor(R.color.train_btn_return);
+ }
+
+ }else{
+ return getResources().getColor(R.color.examing);
+ }
+ }
+ }
+ }
+ return getResources().getColor(R.color.examing);
+ }
+
private void showChangKaoOrLukao(int exam_type){
if (exam_type > ExamPlatformData.EXAM_TYPE_ChangKAO){
@@ -363,8 +422,6 @@
mScoreAdapter.addDatas(mArrayList);
MyLog.i("item_score="+item_id);
}
- //TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
-// sendJKMessage0203(failedProj_selects);
MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
currTotalScore -=item_id;
MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
@@ -459,8 +516,18 @@
-
private void initView(View view) {
+ btn_ids.add(R.id.btn_1);
+ btn_ids.add(R.id.btn_2);
+ btn_ids.add(R.id.btn_3);
+ btn_ids.add(R.id.btn_4);
+ btn_ids.add(R.id.btn_5);
+ btn_ids.add(R.id.btn_6);
+ btn_ids.add(R.id.btn_7);
+ btn_ids.add(R.id.btn_8);
+ btn_ids.add(R.id.btn_9);
+ btn_ids.add(R.id.btn_10);
+
view.findViewById(R.id.iv_head).setOnClickListener(this);
av_curve = view.findViewById(R.id.av3);
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/PlatFormConstant.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/PlatFormConstant.java
index eb46ffe..76c08bd 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/PlatFormConstant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/PlatFormConstant.java
@@ -12,4 +12,5 @@
public static final short STU_INFO_SUCC = 1;
@Nullable
public static final String RTK = "RTK_Config";
+ public static final String LUKAO = "LuKao";
}
diff --git a/app/src/main/res/layout/layout_road_train.xml b/app/src/main/res/layout/layout_road_train.xml
index 2024521..fd77b47 100644
--- a/app/src/main/res/layout/layout_road_train.xml
+++ b/app/src/main/res/layout/layout_road_train.xml
@@ -21,65 +21,71 @@
<Button android:id="@+id/btn_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/start_vehicle"/>
+ android:text="@string/straight_line"/>
<Button android:id="@+id/btn_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/straight_line"/>
+ android:text="@string/add_subtract"/>
<Button android:id="@+id/btn_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/crosswalk"/>
+ android:text="@string/pull_over"/>
<Button android:id="@+id/btn_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/side_by_side"/>
+ android:text="@string/by_crossing"/>
<Button android:id="@+id/btn_5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/school_area"/>
+ android:text="@string/junction_left"/>
<Button android:id="@+id/btn_6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/junction_left"/>
+ android:text="@string/junction_right"/>
</TableRow>
<TableRow android:layout_width="wrap_content"
android:id="@+id/second"
android:layout_height="35dp">
+
<Button android:id="@+id/btn_7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/side_by_side"/>
- <Button android:id="@+id/btn_8"
+ android:text="@string/crosswalk"/>
+ <Button android:id="@+id/btn_8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/add_subtract"/>
+ android:text="@string/school_area"/>
<Button android:id="@+id/btn_9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/over_take"/>
+ android:text="@string/bus_area"/>
<Button android:id="@+id/btn_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/by_crossing"/>
+ android:text="@string/turn_around"/>
<Button android:id="@+id/btn_11"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/bus_area"/>
+ android:visibility="gone"
+ android:text="@string/turn_around"/>
<Button android:id="@+id/btn_12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:visibility="gone"
android:text="@string/lane_change"/>
+ <Button android:id="@+id/btn_13"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:text="@string/night_driving"/>
</TableRow>
<TableRow android:layout_width="wrap_content"
+ android:visibility="gone"
android:id="@+id/third"
android:layout_height="35dp">
- <Button android:id="@+id/btn_13"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/night_driving"/>
+
<Button android:id="@+id/btn_14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
--
Gitblit v1.8.0