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 +++++++++++++--
1 files changed, 13 insertions(+), 2 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+"寮�濮�");
+ }
+
}
}
--
Gitblit v1.8.0