From 1ec3e0408ca98386a3add92f9a7d9cabb7929cdd Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 13 四月 2020 17:47:03 +0800
Subject: [PATCH] 修改开始考试/结束考试协议mode字段不正确的问题
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 4 ++--
gradle/wrapper/gradle-wrapper.properties | 2 +-
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 4 ++--
3 files changed, 5 insertions(+), 5 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 e096b99..6574525 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -619,7 +619,7 @@
jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
jkMessage0202.curr_exam = 0;
- jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
+ jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
}
@@ -640,7 +640,7 @@
jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
jkMessage0202.curr_exam = 1;
- jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
+ jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
}
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 baebf8b..9f6846a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -614,7 +614,7 @@
ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
jkMessage0202.curr_exam = 0;
- jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
+ jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
}
@@ -628,7 +628,7 @@
sendExamJson(1,exam_type);
ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
jkMessage0202.curr_exam = 1;
- jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
+ jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 514e9a8..9e2c728 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
--
Gitblit v1.8.0