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/fragment/TrainFragment.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 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;
     }
+
+
 }

--
Gitblit v1.8.0