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/worker/TTSWorker.kt | 146 ++++++++++++++++++++++++------------------------
1 files changed, 73 insertions(+), 73 deletions(-)
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