From 6de6a028d1ad94f1f0481e0f81a09e63e314fb5a Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期五, 27 三月 2020 00:16:42 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/app.java | 15 +++++++++++++--
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 20 ++++++++++++++++----
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 2eb2a77..5cda929 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -249,11 +249,22 @@
String itemstr=ExamPlatformData.getInstance().getItemStatusStr(type);
MyLog.i(PlatFormConstant.LUKAO,String.format("%s",itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"缁撴潫":"寮�濮�")));
if (ExamPlatformData.getInstance().getTrainingMode()== ExamPlatformData.TRAINING_MODE){
+ if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ MyLog.i("璺�冧笉鎶ラ」鐩紑濮嬬粨鏉熻闊�");
+ }else{
- ExamPlatformData.getInstance().getTTS().speak(itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"缁撴潫":"寮�濮�"));
+ ExamPlatformData.getInstance().getTTS().speak(itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"缁撴潫":"寮�濮�"));
+ }
+
}else{
if (enter_status!=Constant.EXIT_CURRENT_ITEM){
- ExamPlatformData.getInstance().getTTS().speak(itemstr+"寮�濮�");
+ if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ MyLog.i("璺�冧笉鎶ラ」鐩紑濮嬬粨鏉熻闊�");
+ }else{
+
+ ExamPlatformData.getInstance().getTTS().speak(itemstr+"寮�濮�");
+ }
+
}
}
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 296b540..5c8b3f8 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -88,6 +88,7 @@
private HouseView houseView;
private List<ExamStatus> examStatusList = new ArrayList<>();
private List<String> item_conents = new ArrayList<>();//鍧￠亾瀹氱偣鍋滆溅鍜岃捣姝�
+ private int changKaoCount=0;
private int item_id;//鎵ｅ垎鍒嗘暟鎬诲拰
private ExamStatusViewModel examStatusViewModel;
@@ -362,8 +363,8 @@
MyLog.i("璺�冨綋鍓嶅緱鍒嗭細"+currTotalScore);
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i("璺�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
-// ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
-// stopExam();
+ ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
+ stopExam();
}
MyLog.i("璺�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
mHandler.obtainMessage(ADD_DATA).sendToTarget();
@@ -408,8 +409,8 @@
MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i("鍦鸿�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
-// ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
-// stopExam();
+ ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
+ stopExam();
}
MyLog.i("鍦鸿�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
mHandler.obtainMessage(ADD_DATA).sendToTarget();
@@ -438,6 +439,17 @@
Log.i(TAG, "ExamStatus onChanged: ");
if (examStatus!=null && examStatus.size()>0){
MyLog.i(TAG,"鑰冭瘯鐘舵�佹洿鏂�");
+ if (ExamPlatformData.getInstance().getExamType()<=ExamPlatformData.EXAM_TYPE_ChangKAO){
+ for (ExamStatus e:examStatus){
+ if (changKaoCount>=5){
+ MyLog.i("姝ｅ父鐨勮�冭瘯缁撴潫锛屼簲涓」鐩叏鑰冨畬");
+ changKaoCount=0;
+ }
+ if(e.getEnter()== safeluck.drive.evaluation.DB.Constant.FINISH_ITEM){
+ changKaoCount++;
+ }
+ }
+ }
showChangKaoOrLukao(examStatus.get(0).getStartExam());
examStatusList.clear();
examStatusList.addAll(examStatus);
--
Gitblit v1.8.0