From bfc4b75ad4e06bac49a3288008dc035639e762f6 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 09 三月 2020 17:18:02 +0800
Subject: [PATCH] 修改map fragment paint为空导致bug；修改已发送sis的保存
---
app/src/main/assets/criteria_I.json | 4 ++--
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java | 6 +++++-
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 25 +++++++++++++++----------
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 4 +++-
4 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/app/src/main/assets/criteria_I.json b/app/src/main/assets/criteria_I.json
index d6087d0..b9ce307 100644
--- a/app/src/main/assets/criteria_I.json
+++ b/app/src/main/assets/criteria_I.json
@@ -65,14 +65,14 @@
{
"item_id":10,
"item_content": "鍊掕溅鍏ュ簱",
- "deducting_reason": "椤圭洰瀹屾垚鏃堕棿瓒呰繃210s",
+ "deducting_reason": "椤圭洰瀹屾垚鏃堕棿瓒呰繃210绉�",
"score_deducting":100,
"required_precision":""
},
{
"item_id":11,
"item_content": "鍊掕溅鍏ュ簱",
- "deducting_reason": "涓�斿仠杞︽椂闂磋秴杩�2s",
+ "deducting_reason": "涓�斿仠杞︽椂闂磋秴杩�2绉�",
"score_deducting":5,
"required_precision":""
},
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java
index 4a050c9..78458d5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java
@@ -32,7 +32,11 @@
jsonObject = new JSONObject(str);
int mapId = jsonObject.getInt("map_id");
int enter = jsonObject.getInt("enter");
- WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().updateEnter(enter,mapId);
+ ExamStatus examStatus = new ExamStatus();
+ examStatus.setEnter(enter);
+ examStatus.setMap_id(mapId);
+ examStatus.setMap_item(1);
+ WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().insert(examStatus);
return Result.success();
} catch (JSONException e) {
e.printStackTrace();
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
index ed62f16..a58a499 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -292,7 +292,9 @@
canvas2.drawColor(Color.WHITE);
-
+ if (paint == null || canvas2==null){
+ return;
+ }
paint.setStyle(Paint.Style.FILL_AND_STROKE);
paint.setColor(Color.BLUE);
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 fac164a..c7fb43f 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -160,8 +160,9 @@
//TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
sendJKMessage0203(failedProj_selects);
currTotalScore -=item_id;
+ MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
if (currTotalScore < Constant.PASSING_SCORE){
- MyLog.i(TAG,"浣庝簬80锛屼笉鍚堟牸");
+ MyLog.i(TAG,"浣庝簬80锛屼笉鍚堟牸"+currTotalScore);
ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
stopExam();
}
@@ -246,13 +247,13 @@
jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
for (int i = 0; i < failedProj_selects.size(); i++) {
- if (hasSnEqulas(failedProj_selects)){
-
+ if (hasSnEqulas(failedProj_selects.get(i).getSn())){
+ MyLog.i("sn鐩稿悓"+failedProj_selects.get(i).getSn());
}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锛屽彂閫�");
+ MyLog.i("娌℃湁鐩稿悓鐨剆n锛屽彂閫�"+failedProj_selects.get(i).getSn());
sns.add(failedProj_selects.get(i).getSn());
jkMessage0203.timeBCD = failedProj_selects.get(i).getUtc();
jkMessage0203.fail_item_id = failedProj_selects.get(i).getEmp_id();
@@ -271,16 +272,15 @@
MessageProcessor.getInstance().sendMessage(jkMessage0203);
}
- private boolean hasSnEqulas(List<FailedProj_select> failedProj_selects){
+ private boolean hasSnEqulas(int failedProjSn){
if (sns.size() > 0){
- for (int i = 0; i < failedProj_selects.size(); i++) {
for (int j = 0; j < sns.size(); j++) {
- if (sns.get(j) == failedProj_selects.get(i).getSn()){
- MyLog.i("sn鐩稿悓锛屼笉鍙�");
+ MyLog.i("宸插瓨鍦ㄧ殑sn"+sns.get(j));
+ if (sns.get(j) == failedProjSn){
+ MyLog.i("sn鐩稿悓锛屼笉鍙�"+sns.get(j));
return true;
}else{
continue;
- }
}
}
@@ -296,7 +296,7 @@
switch (status) {
case 0://鑰冭瘯瀹屾垚
switch (map_id) {
- case 1://鍊掑簱
+ case 863://鍊掑簱
if (item_conents.contains("鍊掕溅鍏ュ簱")) {
return getResources().getColor(R.color.colorAccent);
}else{
@@ -329,6 +329,7 @@
}
case 1://杩涘叆鑰冨満椤圭洰
+ MyLog.i("pink 杩涘叆鏌愪釜鑰冨満椤圭洰");
return getResources().getColor(R.color.pink);
case 2://寰呰��
return getResources().getColor(R.color.examing);
@@ -396,6 +397,8 @@
failedProjViewModel.deleteAll();
sendExamJson(1);
iv_head.getDrawable().setLevel(1);
+ //娓呯┖sns
+ sns.clear();
//TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
JKMessage0202 jkMessage0202 = new JKMessage0202();
jkMessage0202.phone = "0314200100000004";
@@ -445,6 +448,8 @@
private void stopExam() {
MyLog.i(TAG,"缁撴潫鑰冭瘯");
+ //娓呯┖宸茬粡瀛樺湪鐨剆ns
+ sns.clear();
item_id = 0;
currTotalScore = 100;
tv_total_score.setText(String.valueOf(currTotalScore));
--
Gitblit v1.8.0