From 5fdd4458a3c9f99a3c951683d503f73a47ff976d Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期五, 13 三月 2020 15:43:07 +0800
Subject: [PATCH] 解决RTK配置，传感器配置收到NDK_Start的时候发两次的问题；在ExamStatusOutWork里面发送rtf配置 传感器配置、考试状态；RTK配置增加数据库访问；电话使用sn，sn更新发送给服务在RTKConfigUpdateWorker；基本设置里删除电话显示；修改鉴权消息，使用服务器注册给的密码，用des加密时间，发鉴权消息给服务；Utils增加des加密和解密算法
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 97 ++++++++++++++++++++----------------------------
1 files changed, 40 insertions(+), 57 deletions(-)
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 21612d1..e1aba26 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -127,7 +127,7 @@
av_zhijiao.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_ANGLE));
}
if (msg.what == SPEED_DATA){
- tv_speed.setText(getResources().getString(R.string.speed,speed));
+ tv_speed.setText(getActivity().getApplicationContext().getResources().getString(R.string.speed,speed));
}
if (msg.what == Constant.IC_ID){
try {
@@ -186,7 +186,13 @@
return getResources().getColor(R.color.colorAccent);
}else{
- ExamPlatformData.getInstance().getTTS().speak("鍊掕溅鍏ュ簱鍚堟牸");
+ if (examStatus.getResult() ==1){
+ MyLog.i("宸茬粡鎾斁杩囧�掕溅鍏ュ簱鍚堟牸");
+ }else{
+ ExamPlatformData.getInstance().getTTS().speak("鍊掕溅鍏ュ簱鍚堟牸");
+ examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
+ }
+
return getResources().getColor(R.color.train_btn_return);
}
case 2:
@@ -194,7 +200,13 @@
MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
return getResources().getColor(R.color.colorAccent);
}else{
- ExamPlatformData.getInstance().getTTS().speak("鍧￠亾瀹氱偣鍋滆溅鍜岃捣姝ュ悎鏍�");
+ if (examStatus.getResult() ==1){
+ MyLog.i("宸茬粡鎾斁杩囧潯閬撳畾鐐瑰仠杞﹀拰璧锋鍚堟牸鍚堟牸");
+ }else{
+ ExamPlatformData.getInstance().getTTS().speak("鍧￠亾瀹氱偣鍋滆溅鍜岃捣姝ュ悎鏍�");
+ examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
+ }
+
return getResources().getColor(R.color.train_btn_return);
}
case 3:
@@ -202,7 +214,13 @@
MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
return getResources().getColor(R.color.colorAccent);
}else{
- ExamPlatformData.getInstance().getTTS().speak("渚ф柟鍋滆溅鍚堟牸");
+ if (examStatus.getResult() ==1){
+ MyLog.i("宸茬粡鎾斁杩囦晶鏂瑰仠杞﹀悎鏍�");
+ }else{
+
+ ExamPlatformData.getInstance().getTTS().speak("渚ф柟鍋滆溅鍚堟牸");
+ examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
+ }
return getResources().getColor(R.color.train_btn_return);
}
case 4:
@@ -210,8 +228,13 @@
MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
return getResources().getColor(R.color.colorAccent);
}else{
- ExamPlatformData.getInstance().getTTS().speak("鏇茬嚎琛岄┒鍚堟牸");
- examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
+ if (examStatus.getResult() ==1){
+ MyLog.i("宸茬粡鎾斁杩囨洸绾胯椹跺悎鏍�");
+ }else{
+
+ ExamPlatformData.getInstance().getTTS().speak("鏇茬嚎琛岄┒鍚堟牸");
+ examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
+ }
return getResources().getColor(R.color.train_btn_return);
}
case 5:
@@ -219,8 +242,13 @@
MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
return getResources().getColor(R.color.colorAccent);
}else{
- MyLog.i("璇ラ」鑰冭瘯鎴愬姛锛宼ype="+type);
- ExamPlatformData.getInstance().getTTS().speak("鐩磋杞集鍚堟牸");
+ if (examStatus.getResult() ==1){
+ MyLog.i("宸茬粡鎾斁杩囩洿瑙掕浆寮悎鏍�");
+ }else{
+ ExamPlatformData.getInstance().getTTS().speak("鐩磋杞集鍚堟牸");
+ examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
+ }
+
return getResources().getColor(R.color.train_btn_return);
}
@@ -270,7 +298,7 @@
MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i("浣庝簬80锛屼笉鍚堟牸"+currTotalScore);
- ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
+// ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
// stopExam();
}
MyLog.i("鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
@@ -401,53 +429,6 @@
}
- private int whatPaintColor(ExamStatus examStat) {
- int map_id = examStat.getMap_id();
- int status = examStat.getEnter();
- MyLog.i(TAG, "whatPaintColor: map_id="+map_id+" status="+status);
- switch (status) {
- case 0://鑰冭瘯瀹屾垚
- switch (map_id) {
- case 1://鍊掑簱
- if (item_conents.contains("鍊掕溅鍏ュ簱")) {
- return getResources().getColor(R.color.colorAccent);
- }else{
- return getResources().getColor(R.color.train_btn_return);
- }
- case 2:
- if (item_conents.contains("鍧￠亾瀹氱偣鍋滆溅鍜岃捣姝�")) {
- return getResources().getColor(R.color.colorAccent);
- }else{
- return getResources().getColor(R.color.train_btn_return);
- }
- case 3:
- if (item_conents.contains("渚ф柟鍋滆溅")) {
- return getResources().getColor(R.color.colorAccent);
- }else{
- return getResources().getColor(R.color.train_btn_return);
- }
- case 4:
- if (item_conents.contains("鏇茬嚎琛岄┒")) {
- return getResources().getColor(R.color.colorAccent);
- }else{
- return getResources().getColor(R.color.train_btn_return);
- }
- case 5:
- if (item_conents.contains("鐩磋杞集")) {
- return getResources().getColor(R.color.colorAccent);
- }else{
- return getResources().getColor(R.color.train_btn_return);
- }
-
- }
- case 1://杩涘叆鑰冨満椤圭洰
- MyLog.i("pink 杩涘叆鏌愪釜鑰冨満椤圭洰");
- return getResources().getColor(R.color.pink);
- case 2://寰呰��
- return getResources().getColor(R.color.examing);
- }
- return getResources().getColor(R.color.examing);
- }
private void initView(View view) {
@@ -546,6 +527,8 @@
@Override
public void changKao() {
exam_type = 2;
+
+ iv_head.getDrawable().setLevel(1);
examStatusViewModel.updateStartExam(exam_type);
sendExamJson(1,exam_type);
ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭�冭瘯");
@@ -571,6 +554,7 @@
MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ iv_head.getDrawable().setLevel(1);
tempQs.add(list.get(0));
int [] a =Utils.getRandomInts(4,12);
for (int i = 0; i < a.length; i++) {
@@ -589,7 +573,6 @@
}
});
- iv_head.getDrawable().setLevel(1);
//娓呯┖sns
sns.clear();
--
Gitblit v1.8.0