From ae87fe99ce357d24a6568f723e87788e0e692dff Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期二, 24 十一月 2020 14:18:10 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 3c042d1..effc8f8 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -752,12 +752,12 @@
Toast.makeText(_mActivity, "缁撴潫閲囬泦", Toast.LENGTH_SHORT).show();
routeLineViewModel.updateCurrCollectFlag("");
routeCollectController.endRoadListener();
- ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.MODE_NONE);
exam_type = 0;
examStatusViewModel.updateStartExam(exam_type);
items.setVisibility(View.VISIBLE);
items_score.setVisibility(View.VISIBLE);
route_collect.setVisibility(View.GONE);
+ stopRouteCollect();
}else{
stopExam();
@@ -862,6 +862,13 @@
}
}
+ private void stopRouteCollect() {
+ //璁剧疆妯″紡涓篘ONE 0
+ ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.MODE_NONE);
+ ExamPlatformData.getInstance().getTTS().speak("缁撴潫閲囬泦");
+ sendExamJson(0,0);
+ }
+
private void startArcGisMapFragment(String url) {
if (!TextUtils.isEmpty(url)) {
ArcGisMapFragment jiaXiaoFragment = findFragment(ArcGisMapFragment.class);
--
Gitblit v1.8.0