From 7fe6ae94fe801be92927b6dd095d483cba282752 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 23 三月 2020 13:03:51 +0800
Subject: [PATCH] 训练模式不发0204结束考试消息；rtk状态图标默认为0未连接
---
app/src/main/java/safeluck/drive/evaluation/app.java | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index bfb131c..f926d00 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -247,7 +247,15 @@
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?"缁撴潫":"寮�濮�"));
+ if (ExamPlatformData.getInstance().getTrainingMode()== ExamPlatformData.TRAINING_MODE){
+
+ ExamPlatformData.getInstance().getTTS().speak(itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"缁撴潫":"寮�濮�"));
+ }else{
+ if (enter_status!=Constant.EXIT_CURRENT_ITEM){
+ ExamPlatformData.getInstance().getTTS().speak(itemstr+"寮�濮�");
+ }
+
+ }
} catch (JSONException e) {
e.printStackTrace();
}
@@ -317,31 +325,14 @@
if (ExamPlatformData.getInstance().getExamplatformStatus()==ExamPlatformData.DEV_LOGIN){
try {
JSONObject jsSpeed = new JSONObject(json);
- double latitude = jsSpeed.getDouble("latitude");
- double longitude = jsSpeed.getDouble("longitude");
- double altitude = jsSpeed.getDouble("altitude");
double speed = jsSpeed.getDouble("speed");
- int qf = jsSpeed.getInt("qf");
- double track_ture = jsSpeed.getDouble("track_ture");
- String utc = jsSpeed.getString("utc");
CEventCenter.dispatchEvent(Constant.BIND_RTK_SPEED_TOPIC,cmd,0,speed);
- utc = utc.replace(".","");
JKMessage0206 jkMessage0206 = new JKMessage0206();
jkMessage0206.alert = 0;
jkMessage0206.status = 0;
- jkMessage0206.jd = longitude;
- jkMessage0206.wd = latitude;
- jkMessage0206.gaoCheng = (int)altitude;
- jkMessage0206.speed = speed;
- jkMessage0206.fangXiang = (int)track_ture;
- jkMessage0206.rf = qf;
- if (utc.length()>16){
- utc = utc.substring(0,16);
- }
- jkMessage0206.timeBCD = utc;
+
jkMessage0206.json =json;
jkMessage0206.length = jkMessage0206.json.length();
-// MyLog.i("鍦扮悊鍧愭爣闀垮害="+jkMessage0206.length);
AttachInfo attachInfo = new AttachInfo();
attachInfo.attach_message_id = Integer.parseInt(String.valueOf(0x40));
attachInfo.attach_message_length = 4;
--
Gitblit v1.8.0