From bc5daf3eb3d9f99e884a15013f8dd2826f5e6562 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 21 九月 2020 15:58:50 +0800
Subject: [PATCH] 加入路口、路段查询功能；在选中当前采集线路下开始查询并设置监听；进入路口弹框选择，出路口弹框消失
---
app/src/main/java/safeluck/drive/evaluation/Constant.java | 1 +
app/src/main/java/safeluck/drive/evaluation/routecollect/impl/RouteModel.java | 4 ----
app/src/main/java/safeluck/drive/evaluation/routecollect/RouteCollectController.java | 7 +++++++
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 14 ++++++++++----
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index 17f62ca..c54040d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -80,6 +80,7 @@
public static final int MCU_SN = 8;
public static final int IC_ID = 0x0011;//4锛� 杩斿洖IC鍗′俊鎭�
+ public static final int ID_MS_INQ_ROAD_CROSSING = 0x8018; // 涓诲姩鏌ヨ褰撳墠璺鍜岃矾鍙�;
public static final int SEND_CONFIG_SIGNAL = 0x8008;
public static final String STU_INFO_PLATFORM = "STU_INFO_PLATFORM";
public static final int SHUTDOWN_TIME = 16;
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 a66a6a2..266a406 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -409,6 +409,7 @@
for (int i = 0; i < routeBeans.size(); i++) {
if (routeBeans.get(i).getCurrentCollectFlag()==1){
currRouteBean = routeBeans.get(i);
+ routeCollectController.checkWetherRoadIn();
ExamPlatformData.getInstance().setRouteCollectLineName(currRouteBean.getRouteName());
stringBuilder.delete(0,stringBuilder.length());
stringBuilder.append("褰撳墠閲囬泦绾胯矾鍚嶇О锛�"+currRouteBean.getRouteName());
@@ -1090,6 +1091,7 @@
super.onDetach();
Log.i(TAG,"onDetach");
CEventCenter.onBindEvent(false,icEventListener,Constant.BIND_SPEED_TOPIC);
+ routeCollectController.endRoadListener();
}
@@ -1165,7 +1167,7 @@
stringBuilder.append("\n");
showRouteCollectInfoText();
}
-
+ SelectDialogThree roadCrossDialog;
@Override
public void roadcrossInfo(RoadCrossInfo roadCrossInfo) {
Log.i(TAG,String.format("閬撹矾璺彛淇℃伅%s",roadCrossInfo.toString()));
@@ -1184,9 +1186,9 @@
CThreadPoolExecutor.runOnMainThread(new Runnable() {
@Override
public void run() {
- SelectDialogThree selectDialogThree = SelectDialogThree.newInstance("璺彛鐩磋","璺彛宸﹁浆寮�","璺彛鍙宠浆寮�","璺彛鎺夊ご");
- selectDialogThree.show(getFragmentManager(),"aaa");
- selectDialogThree.setSelectedListener(new SelectDialogThree.OnSelectedListener() {
+ roadCrossDialog = SelectDialogThree.newInstance("璺彛鐩磋","璺彛宸﹁浆寮�","璺彛鍙宠浆寮�","璺彛鎺夊ご");
+ roadCrossDialog.show(getFragmentManager(),"aaa");
+ roadCrossDialog.setSelectedListener(new SelectDialogThree.OnSelectedListener() {
@Override
public void makeYourChoice(int res) {
switch (res){
@@ -1218,6 +1220,8 @@
});
}
});
+ }else{
+ roadCrossDialog.dismiss();
}
@@ -1236,4 +1240,6 @@
}
return -1;
}
+
+
}
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 9915074..fd820ba 100644
--- a/app/src/main/java/safeluck/drive/evaluation/routecollect/RouteCollectController.java
+++ b/app/src/main/java/safeluck/drive/evaluation/routecollect/RouteCollectController.java
@@ -4,6 +4,7 @@
import com.anyun.exam.lib.AYSdk;
+import safeluck.drive.evaluation.Constant;
import safeluck.drive.evaluation.fragment.TrainFragment;
import safeluck.drive.evaluation.routecollect.bean.RoadCrossInfo;
import safeluck.drive.evaluation.routecollect.bean.RoadInfo;
@@ -39,6 +40,12 @@
routeModel.setLoadListener(this);
}
+ /**
+ * 鏌ヨ鏄惁鍦ㄦ煇涓�璺彛锛堣矾娈碉級鍐�
+ */
+ public void checkWetherRoadIn(){
+ AYSdk.getInstance().sendCmd(Constant.ID_MS_INQ_ROAD_CROSSING,"");
+ }
public void startCollect() {
if (iCollectView != null){
diff --git a/app/src/main/java/safeluck/drive/evaluation/routecollect/impl/RouteModel.java b/app/src/main/java/safeluck/drive/evaluation/routecollect/impl/RouteModel.java
index 1461829..8a25b43 100644
--- a/app/src/main/java/safeluck/drive/evaluation/routecollect/impl/RouteModel.java
+++ b/app/src/main/java/safeluck/drive/evaluation/routecollect/impl/RouteModel.java
@@ -83,10 +83,6 @@
@Override
public void startCollect() {
-
- //璋冪敤AYSdk 鏂规硶鍚姩閲囩偣
- //set IRouteRemotePointCallback
-
//濡傛灉閲囩敤application鐨刢allback 锛屽彲鑳介渶瑕佹敞鍐屼竴涓狢EventLisntener
CEventCenter.onBindEvent(true,icEventListener, Constant.BIND_RTK_INFO_MAP);
}
--
Gitblit v1.8.0