From 8a237469ec680603b1c662dc7e67bd3ff0bbfd2a Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期六, 21 三月 2020 19:01:00 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 123 ++++++++++++++++-------------------------
1 files changed, 48 insertions(+), 75 deletions(-)
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 e01e7e5..6cd2d21 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -303,7 +303,7 @@
MyLog.i("item_score="+item_id);
}
//TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
- sendJKMessage0203(failedProj_selects);
+// sendJKMessage0203(failedProj_selects);
MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
currTotalScore -=item_id;
MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
@@ -395,59 +395,53 @@
return view;
}
- private void sendJKMessage0203(List<FailedProj_select> failedProj_selects) {
- JKMessage0203 jkMessage0203 = new JKMessage0203();
- jkMessage0203.phone = ExamPlatformData.getInstance().getPhone();
- jkMessage0203.ID = ExamPlatformData.getInstance().getID();
- jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
+// private void sendJKMessage0203(List<FailedProj_select> failedProj_selects) {
+// JKMessage0203 jkMessage0203 = new JKMessage0203();
+// jkMessage0203.phone = ExamPlatformData.getInstance().getPhone();
+// jkMessage0203.ID = ExamPlatformData.getInstance().getID();
+// jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
+//
+// for (int i = 0; i < failedProj_selects.size(); i++) {
+// 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锛屽彂閫�"+failedProj_selects.get(i).getSn());
+// ExamPlatformData.getInstance().addSn(failedProj_selects.get(i).getSn());
+// String utc = failedProj_selects.get(i).getUtc();
+// if (!TextUtils.isEmpty(utc)&&utc.length()>12){
+// utc =utc.substring(0,12);
+// }
+// jkMessage0203.timeBCD = utc ;
+//
+// jkMessage0203.fail_item_id = failedProj_selects.get(i).getEmp_id();
+// jkMessage0203.fail_score = failedProj_selects.get(i).getScore_deducting();
+// jkMessage0203.fail_reason = failedProj_selects.get(i).getDeducting_reason();
+// }
+//
+// }
- for (int i = 0; i < failedProj_selects.size(); i++) {
- 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锛屽彂閫�"+failedProj_selects.get(i).getSn());
- ExamPlatformData.getInstance().addSn(failedProj_selects.get(i).getSn());
- String utc = failedProj_selects.get(i).getUtc();
- if (!TextUtils.isEmpty(utc)&&utc.length()>12){
- utc =utc.substring(0,12);
- }
- jkMessage0203.timeBCD = utc ;
+// MessageProcessor.getInstance().sendMessage(jkMessage0203);
+// }
- jkMessage0203.fail_item_id = failedProj_selects.get(i).getEmp_id();
- jkMessage0203.fail_score = failedProj_selects.get(i).getScore_deducting();
- jkMessage0203.fail_reason = failedProj_selects.get(i).getDeducting_reason();
- }
-
- }
-
-
-
-
-
-
-
- MessageProcessor.getInstance().sendMessage(jkMessage0203);
- }
-
- private boolean hasSnEqulas(int failedProjSn){
- if (ExamPlatformData.getInstance().getSns().size() > 0){
- for (int j = 0; j < ExamPlatformData.getInstance().getSns().size(); j++) {
- MyLog.i("宸插瓨鍦ㄧ殑sn"+ExamPlatformData.getInstance().getSns().get(j));
- if (ExamPlatformData.getInstance().getSns().get(j) == failedProjSn){
- MyLog.i("sn鐩稿悓锛屼笉鍙�"+ExamPlatformData.getInstance().getSns().get(j));
- return true;
- }else{
- continue;
- }
- }
-
- }
- return false;
-
- }
+// private boolean hasSnEqulas(int failedProjSn){
+// if (ExamPlatformData.getInstance().getSns().size() > 0){
+// for (int j = 0; j < ExamPlatformData.getInstance().getSns().size(); j++) {
+// MyLog.i("宸插瓨鍦ㄧ殑sn"+ExamPlatformData.getInstance().getSns().get(j));
+// if (ExamPlatformData.getInstance().getSns().get(j) == failedProjSn){
+// MyLog.i("sn鐩稿悓锛屼笉鍙�"+ExamPlatformData.getInstance().getSns().get(j));
+// return true;
+// }else{
+// continue;
+// }
+// }
+//
+// }
+// return false;
+//
+// }
@@ -538,6 +532,7 @@
public void changKao() {
exam_type = 2;
iv_head.getDrawable().setLevel(1);
+ ExamPlatformData.getInstance().setExamType(exam_type);
examStatusViewModel.updateStartExam(exam_type);
sendExamJson(1,exam_type);
ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
@@ -551,36 +546,14 @@
@Override
public void luKao() {
exam_type = 3;
+ ExamPlatformData.getInstance().setExamType(exam_type);
examStatusViewModel.updateStartExam(exam_type);
sendExamJson(1,exam_type);
- if (simulateNightBean == null){
- simulateNightBean = new SimulateNightBean();
- }
- iv_head.getDrawable().setLevel(1);
- simulateNightBean.setExam(0);
- ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
- ExamPlatformData.getInstance().setTrainingMode(true);//璁剧疆涓鸿缁冩ā寮�
- final List<SimulateNightBean.QuestionBean> list = ExamPlatformData.getInstance().getSimulate_light_tips();
- simulateNightBean.setQuestion(list.subList(list.size()-2,list.size()-1));
- AYSdk.getInstance().sendCmd(0x8012,gson.toJson(simulateNightBean));
jkMessage0202.curr_exam = 1;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
- tempQs.add(list.get(0));
- int [] a =Utils.getRandomInts(4,12);
- for (int i = 0; i < a.length; i++) {
- tempQs.add(list.get(a[i]));
- }
- simulateNightBean.setQuestion(tempQs);
- mHandler.postDelayed(new Runnable() {
- @Override
- public void run() {
- AYSdk.getInstance().sendCmd(0x8012,gson.toJson(simulateNightBean));
- tempQs.clear();
- }
- },10*1000);
}
});
--
Gitblit v1.8.0