From 936802527687876e44eae026465152680f34881d Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 09 三月 2020 16:05:35 +0800
Subject: [PATCH] 加入路考部分东西；加入失败项目语音提示；加入进出某场地语音提示
---
app/src/main/java/safeluck/drive/evaluation/Constant.java | 1
app/src/main/java/safeluck/drive/evaluation/app.java | 11 +++
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 27 +++++++++
app/src/main/assets/criteria_I.json | 8 +-
app/src/main/res/values/strings.xml | 16 +++++
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 7 +
app/src/main/res/layout/layout_net_train_iii_item.xml | 72 ++++++++++++++++++++++++
7 files changed, 136 insertions(+), 6 deletions(-)
diff --git a/app/src/main/assets/criteria_I.json b/app/src/main/assets/criteria_I.json
index 167faeb..d6087d0 100644
--- a/app/src/main/assets/criteria_I.json
+++ b/app/src/main/assets/criteria_I.json
@@ -149,7 +149,7 @@
{
"item_id":22,
"item_content": "渚ф柟鍋滆溅",
- "deducting_reason": "椤圭洰瀹屾垚鏃堕棿瓒呰繃90s",
+ "deducting_reason": "椤圭洰瀹屾垚鏃堕棿瓒呰繃90绉�",
"score_deducting":100,
"required_precision":""
},
@@ -177,7 +177,7 @@
{
"item_id":26,
"item_content": "渚ф柟鍋滆溅",
- "deducting_reason": "涓�斿仠杞︽椂闂磋秴杩�2s",
+ "deducting_reason": "涓�斿仠杞︽椂闂磋秴杩�2绉�",
"score_deducting":5,
"required_precision":""
},
@@ -191,7 +191,7 @@
{
"item_id":28,
"item_content": "鏇茬嚎琛岄┒",
- "deducting_reason": "涓�斿仠杞︽椂闂磋秴杩�2s",
+ "deducting_reason": "涓�斿仠杞︽椂闂磋秴杩�2绉�",
"score_deducting":100,
"required_precision":""
},
@@ -212,7 +212,7 @@
{
"item_id":31,
"item_content": "鐩磋杞集",
- "deducting_reason": "涓�斿仠杞︽椂闂磋秴杩�2s",
+ "deducting_reason": "涓�斿仠杞︽椂闂磋秴杩�2绉�",
"score_deducting":5,
"required_precision":""
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index 967a7bd..704de3c 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -82,5 +82,6 @@
public static final int READ_PHYSICAL_ID = 0x8011;//4锛� 璇诲彇IC鍗�
public static final String BIND_MCUINFO_TOPIC = "bind_mcu_info_topic";
public static final String BIND_RTK_SPEED_TOPIC = "BIND_RTK_SPEED_TOPIC";
+ public static final int EXIT_CURRENT_ITEM = 0;//閫�鍑烘煇鍦哄湴
public static String exam_enter_exitdata="exam_enter_exitdata";
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index d33a73a..ba745ad 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -246,6 +246,17 @@
WorkManager.getInstance(getApplicationContext()).enqueue(gpsinfoWorkRequest);
break;
case Constant.ENTER_OR_EXIT_ITEM:
+ int type = 0;
+ int enter_status = -1;
+ try {
+ JSONObject rtkConfigUpdtea = new JSONObject(json);
+ type = rtkConfigUpdtea.getInt("type");
+ enter_status = rtkConfigUpdtea.getInt("enter");
+ String itemstr=ExamPlatformData.getInstance().getItemStatusStr(type);
+ ExamPlatformData.getInstance().getTTS().speak(itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"缁撴潫":"寮�濮�"));
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
Data exam_enter_exitdata = new Data.Builder().putString(Constant.exam_enter_exitdata,json).build();
OneTimeWorkRequest examStatusWorker = new OneTimeWorkRequest.Builder(ExamStatusWoker.class).setInputData(exam_enter_exitdata).build();
WorkManager.getInstance(getApplicationContext()).enqueue(examStatusWorker);
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 06d342a..836677a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -34,6 +34,7 @@
public static final int DEV_NOT_LOGIN = 5;
public static final int DEV_LOGIN = 6;
private static HashMap<Integer,String> examPlatformStrs = new HashMap<>();
+ private static HashMap<Integer,String> enter_exit_item_tts = new HashMap<>();
static {
examPlatformStrs.put(TCP_DISCONNECT,"鏈繛鎺�");
examPlatformStrs.put(TCP_CONNECTED,"宸茶繛鎺�");
@@ -41,6 +42,18 @@
examPlatformStrs.put(DEV_REGISTERED,"宸叉敞鍐�");
examPlatformStrs.put(DEV_NOT_LOGIN,"鏈櫥褰�");
examPlatformStrs.put(DEV_LOGIN,"宸茬櫥褰�");
+
+/*渚ф柟浣嶅仠杞� type = 3
+
+ 鍊掕溅鍏ュ簱 type = 1
+ 涓婂潯璧锋 type = 2
+ zhijiao type = 5*/
+
+ enter_exit_item_tts.put(1,"鍊掕溅鍏ュ簱");
+ enter_exit_item_tts.put(2,"鍧￠亾瀹氱偣鍋滆溅鍜岃捣姝�");
+ enter_exit_item_tts.put(3,"渚ф柟鍋滆溅");
+ enter_exit_item_tts.put(4,"鏇茬嚎琛岄┒");
+ enter_exit_item_tts.put(5,"鐩磋杞集");
}
private static final String WORK_PLATFORM_STATUS = " work_platform";
@@ -166,6 +179,18 @@
return examPlatformStrs.get(work_platform);
}
+ /**
+ * 杩涘叆閫�鍑烘煇涓満鍦扮殑鏂囧瓧
+ * @param item
+ * @return
+ */
+ public String getItemStatusStr(int item) {
+ if (item<1 || item>enter_exit_item_tts.size()){
+ return "鏈煡椤圭洰";
+ }
+ return enter_exit_item_tts.get(item);
+ }
+
public Speaker getTTS(){
if (speaker == null){
throw new RuntimeException("璇峰厛鍒濆鍖朤TS,鍏堣皟鐢╥nitTTS");
@@ -183,4 +208,6 @@
speaker = new Speaker(context);
}
}
+
+
}
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 62ed2bd..fac164a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -249,6 +249,9 @@
if (hasSnEqulas(failedProj_selects)){
}else{
+ ExamPlatformData.getInstance().getTTS().speak(failedProj_selects.get(i).getDeducting_reason()+(
+ failedProj_selects.get(i).getScore_deducting()==100?"涓嶅悎鏍�":"鎵�"+
+ failedProj_selects.get(i).getScore_deducting()+"鍒�"));
MyLog.i("娌℃湁鐩稿悓鐨剆n锛屽彂閫�");
sns.add(failedProj_selects.get(i).getSn());
jkMessage0203.timeBCD = failedProj_selects.get(i).getUtc();
@@ -335,7 +338,7 @@
private void initView(View view) {
- view.findViewById(R.id.profile).setOnClickListener(this);
+ view.findViewById(R.id.iv_head).setOnClickListener(this);
av_curve = view.findViewById(R.id.av3);
av_park = view.findViewById(R.id.av2);
av_podao = view.findViewById(R.id.av1);
@@ -419,7 +422,7 @@
case R.id.btn_return:
_mActivity.onBackPressed();
break;
- case R.id.profile:
+ case R.id.iv_head:
MyLog.i(TAG,"绛惧埌锛岃幏鍙栬韩浠借瘉鐗╃悊鍗″彿");
AYSdk.getInstance().sendCmd(Constant.READ_PHYSICAL_ID,"");
//TODO 鑾峰緱鐗╃悊鍗″彿 鍙戦�丣KMessage0201缁欏钩鍙帮紝鑾峰彇濮撳悕銆佽韩浠借瘉銆乭ead_url
diff --git a/app/src/main/res/layout/layout_net_train_iii_item.xml b/app/src/main/res/layout/layout_net_train_iii_item.xml
new file mode 100644
index 0000000..3aa79d3
--- /dev/null
+++ b/app/src/main/res/layout/layout_net_train_iii_item.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableLayout
+ 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:padding="5dp"
+
+ android:gravity="bottom">
+
+ <TableRow android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/simulate_light_night"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/side_by_side"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/over_take"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/school_area"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/bus_area"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/start_vehicle"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/junction_left"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/junction_right"/>
+
+
+
+ </TableRow>
+ <TableRow android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/crosswalk"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/straight_line"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/pull_over"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/night_driving"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/turn_around"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/add_subtract"/>
+ <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/by_crossing"/> <Button android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/lane_change"/>
+
+
+
+
+ </TableRow>
+
+</TableLayout>
\ 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 f46b305..cf04d2f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,4 +35,20 @@
<string name="chesu">杞﹂�燂細</string>
<string name="engine">杞�燂細</string>
<string name="platform_status">鑰冭瘯骞冲彴锛�%1$s</string>
+ <string name="simulate_light_night">妯℃嫙澶滈棿鐏厜</string>
+ <string name="side_by_side">浼氳溅</string>
+ <string name="over_take">瓒呰溅</string>
+ <string name="school_area">閫氳繃瀛︽牎鍖哄煙</string>
+ <string name="bus_area">閫氳繃鍏叡姹借溅绔�</string>
+ <string name="start_vehicle">璧锋</string>
+ <string name="junction_left">璺彛宸﹁浆寮�</string>
+ <string name="junction_right">璺彛鍙宠浆寮�</string>
+ <string name="crosswalk">閫氳繃浜鸿妯亾</string>
+ <string name="straight_line">鐩寸嚎琛岄┒</string>
+ <string name="pull_over">闈犺竟鍋滆溅</string>
+ <string name="night_driving">澶滈棿琛岄┒</string>
+ <string name="turn_around">鎺夊ご</string>
+ <string name="add_subtract">鍔犲噺妗�</string>
+ <string name="by_crossing">閫氳繃璺彛</string>
+ <string name="lane_change">鍙樻洿杞﹂亾</string>
</resources>
--
Gitblit v1.8.0