From aeaf84fc9180eaebd69db8fb582e783ba3d2af78 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期五, 18 九月 2020 15:45:03 +0800
Subject: [PATCH] 加入发送路线采集命令
---
app/src/main/java/safeluck/drive/evaluation/app.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/routecollect/RouteCollectController.java | 5 +++++
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 11 ++++++-----
3 files changed, 12 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 3dfe185..f745d5a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -150,7 +150,7 @@
}else{
-// MyLog.d(TAG,strConent );
+ MyLog.d(TAG,strConent );
lastStr = strConent;
}
switch (cmd) {
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 7c5be3e..2698ff7 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -708,10 +708,11 @@
break;
}
}
-
+ ;
Toast.makeText(_mActivity, "绾胯矾閲囬泦", Toast.LENGTH_SHORT).show();
ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.ROUTE_MODE);
exam_type = 5;
+ sendExamJson(1,exam_type);
examStatusViewModel.updateStartExam(exam_type);
items.setVisibility(View.GONE);
items_score.setVisibility(View.GONE);
@@ -762,10 +763,9 @@
case R.id.view_map:
-// String url = getArcGisUrl(ExamPlatformData.getInstance().getExamType());
-// Log.i(TAG,"map head lulao gps url="+url);
-// startArcGisMapFragment(url);
-// StatusDialog.with(_mActivity).setCancelable(true).setPrompt("鍔犺浇涓紝璇风◢鍚�...").setType(StatusDialog.Type.PROGRESS).show();
+ String url = getArcGisUrl(ExamPlatformData.getInstance().getExamType());
+ Log.i(TAG,"map head lulao gps url="+url);
+ startArcGisMapFragment(url);
break;
@@ -912,6 +912,7 @@
examStatusViewModel.updateStartExam(exam_type);
ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
+ sendMessage();
}
private void sendMessage() {
diff --git a/app/src/main/java/safeluck/drive/evaluation/routecollect/RouteCollectController.java b/app/src/main/java/safeluck/drive/evaluation/routecollect/RouteCollectController.java
index 9759ef3..9c5bdcf 100644
--- a/app/src/main/java/safeluck/drive/evaluation/routecollect/RouteCollectController.java
+++ b/app/src/main/java/safeluck/drive/evaluation/routecollect/RouteCollectController.java
@@ -1,5 +1,7 @@
package safeluck.drive.evaluation.routecollect;
+import com.anyun.exam.lib.AYSdk;
+
import safeluck.drive.evaluation.fragment.TrainFragment;
import safeluck.drive.evaluation.routecollect.bean.RoadCrossInfo;
import safeluck.drive.evaluation.routecollect.bean.RoadInfo;
@@ -24,6 +26,7 @@
this.iCollectView = collectView;
routeModel = new RouteModel();
}
+
public void startCollect() {
if (iCollectView != null){
@@ -53,6 +56,8 @@
}
+
+
@Override
public void roadCrossInfo(RoadCrossInfo roadCrossInfo) {
--
Gitblit v1.8.0