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 ++----
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 2
app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt | 146 ++++++++++++++++++------------------
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 9 --
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 1
app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java | 18 +++-
6 files changed, 99 insertions(+), 106 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 6da2ff2..b11be64 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -285,7 +285,7 @@
//TODO 鍒ゆ柇SPUtils 鏄惁淇濆瓨鏈塪es瀵嗙爜锛涘鏋滄病鏈夊垯杩涜娉ㄥ唽JKMessage0100锛屽鏋滄湁瀵嗙爜鍒欒繘琛岄壌鏉僇KMessage0101
String hexPwd = (String) SPUtils.get(this,SPUtils.DES_HEX_PWD,"");
hexPwd="";
- MessageProcessor.getInstance().addBeatHeart(10);
+ MessageProcessor.getInstance().addBeatHeart(20);
if (TextUtils.isEmpty(hexPwd)){
MyLog.i(PlatFormConstant.TAG,"瀵嗙爜涓嶅瓨鍦紝杩涜娉ㄥ唽锛屽彂閫佹敞鍐屾秷鎭�");
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;
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 79ede48..ef58831 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -442,6 +442,7 @@
tv_work_platform = view.findViewById(R.id.platform);
iv_rtk_status = view.findViewById(R.id.iv_rtk_connect);
+ iv_rtk_status.getDrawable().setLevel(0);
iv_head = view.findViewById(R.id.iv_head);
tv_sat_num = view.findViewById(R.id.tv_sat_num_instatus);
tv_qf = view.findViewById(R.id.tv_qf);
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 c261719..e315f1f 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -463,6 +463,7 @@
tv_work_platform = view.findViewById(R.id.platform);
iv_rtk_status = view.findViewById(R.id.iv_rtk_connect);
+ iv_rtk_status.getDrawable().setLevel(0);
iv_head = view.findViewById(R.id.iv_head);
tv_sat_num = view.findViewById(R.id.tv_sat_num_instatus);
tv_qf = view.findViewById(R.id.tv_qf);
@@ -621,14 +622,6 @@
private void stopExam() {
MyLog.i(TAG,"缁撴潫璁粌");
- //TODO 鍙戦�丣KMessage0204缁欏钩鍙� 缁撴潫鑰冭瘯
- JKMessage0204 jkMessage0204 = new JKMessage0204();
- jkMessage0204.timeBCD = new Date();
- jkMessage0204.score = currTotalScore;
- jkMessage0204.stop = JKMessage0204.SUCC_STOP;
- jkMessage0204.ID = ExamPlatformData.getInstance().getID();
- jkMessage0204.exam_id = ExamPlatformData.getInstance().getExam_id();
- MessageProcessor.getInstance().sendMessage(jkMessage0204);
//璁剧疆妯″紡涓篘ONE 0
ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.MODE_NONE);
diff --git a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
index 0a3bf27..68acffa 100644
--- a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
+++ b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
@@ -92,11 +92,16 @@
JKMessage8001 jkMessage8001 = (JKMessage8001) jk2019MessageBase;
String hexMessageId = jkMessage8001.respMessageId;
if (hexMessageId.equalsIgnoreCase("0101")){
- MyLog.i(PlatFormConstant.TAG,"閴存潈鎴愬姛");
- ExamPlatformData.getInstance().setExamplatformStatus(ExamPlatformData.DEV_LOGIN);
+ if (jkMessage8001.result == JKMessage8001.SUCCESS){
+ MyLog.i(PlatFormConstant.TAG,"閴存潈鎴愬姛");
+ ExamPlatformData.getInstance().setExamplatformStatus(ExamPlatformData.DEV_LOGIN);
+ }else{
+ MyLog.i(PlatFormConstant.TAG,"閴存潈涓嶆垚鍔�:"+jkMessage8001.result);
+ ExamPlatformData.getInstance().setExamplatformStatus(ExamPlatformData.DEV_NOT_LOGIN);
+ }
+
}else{
- MyLog.i(PlatFormConstant.TAG,"鏀跺埌浜嗛壌鏉冩秷鎭紝浣嗛壌鏉冧笉鎴愬姛");
- ExamPlatformData.getInstance().setExamplatformStatus(ExamPlatformData.DEV_NOT_LOGIN);
+ MyLog.i(PlatFormConstant.TAG,String.format("鏀跺埌浜嗗%s娑堟伅鐨勫簲绛�",jkMessage8001.respMessageId));
}
}else if (jk2019MessageBase instanceof JKMessage8201){
JKMessage8201 jkMessage8201 = (JKMessage8201) jk2019MessageBase;
@@ -164,17 +169,20 @@
private boolean canSend(String msgId){
if (ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE){
//璁粌妯″紡涓� 鍙湁鍑犳潯鍙互鍙戦��
+ MyLog.i(PlatFormConstant.TAG,"璁粌妯″紡锛宮sgid="+msgId);
switch (msgId){
case "0206":
case "0100":
case "0101":
return true;
+ default:
+ return false;
}
}else{
//鑰冭瘯妯″紡涓嬪叏閮ㄩ兘鍙互鍙戦��
return true;
}
- return false;
+
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt b/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt
index 048ecc2..cbd9879 100644
--- a/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt
@@ -45,78 +45,78 @@
val sn = jsonObject["sn"].asInt
- if(ExamPlatformData.getInstance().trainingMode == ExamPlatformData.EXAMING_MODE){
- //鑰冭瘯妯″紡 鎬绘墸鍒嗗皬浜�80 鎵嶆姤瀛愬け璐ラ」鐩�
- var totalDecutSocre:Int = 0;
- if (emp_id>1000){
- var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(emp_id-1000)
- totalDecutSocre = ttsStr.score_deducting
- if (totalDecutSocre > ExamPlatformData.getInstance().MAX_SCORE_DUCT){
- ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
- ttsStr.getScore_deducting() + "鍒�")
- }
- }else{
- var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIDao.queryItemForCriteriaINoLive(emp_id)
- totalDecutSocre = ttsStr.score_deducting
- if (totalDecutSocre > ExamPlatformData.getInstance().MAX_SCORE_DUCT){
- ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
- ttsStr.getScore_deducting() + "鍒�")
- }
- }
- if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
-
- }else{
- if (ExamPlatformData.getInstance().examType > ExamPlatformData.EXAM_TYPE_ChangKAO){
- //璺��
- var failedProjs = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).luKaoFailProjDao.getAllFailProjIII(Constant.TEST_STU_ID)
-
- for (i in 0 until failedProjs.size){
- totalDecutSocre+=failedProjs[i].score_deducting
- if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
-
- break;
- }
- }
- if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
- for (i in 0 until failedProjs.size){
- //鎵�鏈夊瓨鍦ㄦ暟鎹簱閲岀殑澶辫触椤�
- var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(failedProjs[i].emp_id)
- ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
- ttsStr.getScore_deducting() + "鍒�")
- }
- //鐜板湪澧炲姞鐨勪竴涓」鐩紝杩樻湭鎻掑叆鏁版嵁搴擄紱 emp_id>1000 璺�冪殑璇�
- var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(emp_id-1000)
- ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
- ttsStr.getScore_deducting() + "鍒�")
- }
-
- }else{
- //鍦鸿��
- var failedProjs = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).failProjDao.getAllFailProjI(Constant.TEST_STU_ID)
-
- for (i in 0 until failedProjs.size){
- totalDecutSocre+=failedProjs[i].score_deducting
- if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
- break;
- }
- }
- if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
- for (i in 0 until failedProjs.size){
- //鎵�鏈夊瓨鍦ㄦ暟鎹簱閲岀殑澶辫触椤�
- var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIDao.queryItemForCriteriaINoLive(failedProjs[i].emp_id)
- ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
- ttsStr.getScore_deducting() + "鍒�")
- }
- //鐜板湪澧炲姞鐨勪竴涓」鐩紝杩樻湭鎻掑叆鏁版嵁搴擄紱 emp_id>1000 璺�冪殑璇�
- var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIDao.queryItemForCriteriaINoLive(emp_id)
- ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
- ttsStr.getScore_deducting() + "鍒�")
- }
- }
- }
-
- }else{
- //璁粌妯″紡鍏ㄩ儴鎶� 璇煶
+// if(ExamPlatformData.getInstance().trainingMode == ExamPlatformData.EXAMING_MODE){
+// //鑰冭瘯妯″紡 鎬绘墸鍒嗗皬浜�80 鎵嶆姤瀛愬け璐ラ」鐩�
+// var totalDecutSocre:Int = 0;
+// if (emp_id>1000){
+// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(emp_id-1000)
+// totalDecutSocre = ttsStr.score_deducting
+// if (totalDecutSocre > ExamPlatformData.getInstance().MAX_SCORE_DUCT){
+// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
+// ttsStr.getScore_deducting() + "鍒�")
+// }
+// }else{
+// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIDao.queryItemForCriteriaINoLive(emp_id)
+// totalDecutSocre = ttsStr.score_deducting
+// if (totalDecutSocre > ExamPlatformData.getInstance().MAX_SCORE_DUCT){
+// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
+// ttsStr.getScore_deducting() + "鍒�")
+// }
+// }
+// if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
+//
+// }else{
+// if (ExamPlatformData.getInstance().examType > ExamPlatformData.EXAM_TYPE_ChangKAO){
+// //璺��
+// var failedProjs = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).luKaoFailProjDao.getAllFailProjIII(Constant.TEST_STU_ID)
+//
+// for (i in 0 until failedProjs.size){
+// totalDecutSocre+=failedProjs[i].score_deducting
+// if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
+//
+// break;
+// }
+// }
+// if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
+// for (i in 0 until failedProjs.size){
+// //鎵�鏈夊瓨鍦ㄦ暟鎹簱閲岀殑澶辫触椤�
+// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(failedProjs[i].emp_id)
+// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
+// ttsStr.getScore_deducting() + "鍒�")
+// }
+// //鐜板湪澧炲姞鐨勪竴涓」鐩紝杩樻湭鎻掑叆鏁版嵁搴擄紱 emp_id>1000 璺�冪殑璇�
+// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(emp_id-1000)
+// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
+// ttsStr.getScore_deducting() + "鍒�")
+// }
+//
+// }else{
+// //鍦鸿��
+// var failedProjs = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).failProjDao.getAllFailProjI(Constant.TEST_STU_ID)
+//
+// for (i in 0 until failedProjs.size){
+// totalDecutSocre+=failedProjs[i].score_deducting
+// if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
+// break;
+// }
+// }
+// if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
+// for (i in 0 until failedProjs.size){
+// //鎵�鏈夊瓨鍦ㄦ暟鎹簱閲岀殑澶辫触椤�
+// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIDao.queryItemForCriteriaINoLive(failedProjs[i].emp_id)
+// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
+// ttsStr.getScore_deducting() + "鍒�")
+// }
+// //鐜板湪澧炲姞鐨勪竴涓」鐩紝杩樻湭鎻掑叆鏁版嵁搴擄紱 emp_id>1000 璺�冪殑璇�
+// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIDao.queryItemForCriteriaINoLive(emp_id)
+// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
+// ttsStr.getScore_deducting() + "鍒�")
+// }
+// }
+// }
+//
+// }else{
+ //涓嶇浠�涔堟ā寮忓叏閮ㄦ姤 璇煶
if (emp_id>1000){
var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(emp_id-1000)
ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
@@ -132,7 +132,7 @@
jkMessage0203.fail_score = ttsStr.score_deducting
jkMessage0203.fail_reason = ttsStr.deducting_reason
}
- }
+// }
--
Gitblit v1.8.0