From 089e2b9025012eaeabfa35885d0d306d53fadcd9 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 9 Nov 2022 15:32:47 +0800
Subject: [PATCH] =?UTF-8?q?[2.12.0]=201=E3=80=81bus=E4=B9=98=E5=AE=A2?=
 =?UTF-8?q?=E5=B1=8F=E6=96=AD=E5=BC=80=E5=8F=B8=E6=9C=BA=E7=AB=AF=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E6=97=B6=E5=80=99=EF=BC=8C=E8=BD=A8=E8=BF=B9=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E7=BB=93=E6=9D=9F=202=E3=80=81bus=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E4=B9=98=E5=AE=A2=E6=A0=B8=E9=94=80=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E6=92=AD=E6=8A=A5=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/BusPassengerModel.java    |  4 ++-
 .../ui/BusPassengerRouteFragment.java         | 29 ++++++++++---------
 .../mogo/och/bus/presenter/BusPresenter.java  |  9 +++---
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 876105b948..2be7474aeb 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -172,8 +172,10 @@ public class BusPassengerModel {
 
                     @Override
                     public void onFail(int code, String msg) {
-                         //code = 1003; message = bus车辆已收车或未出车;
+                         //code = 1003; message = bus车辆已收车或未出车;bus driver shadow,not exists
                         if (code == 1003){
+                            routesResult = null;
+                            startOrStopCalculateRouteInfo(false);
                             queryDriverOperationDelay();
                         }
                     }
diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
index 7c72fc813e..e56557e570 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.amap.api.maps.model.LatLng;
 import com.elegant.utils.UiThreadHandler;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
@@ -98,19 +99,21 @@ public class BusPassengerRouteFragment extends
         mMapArrowIcon = findViewById(R.id.bus_p_arrow_nor);
 
         //测试
-        mSpeedTv.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                BPRouteDataTestUtils.converToRouteData();
-                UiThreadHandler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        updateWayPointList(mStationsList,1);
-                    }
-                },1000);
-                return false;
-            }
-        });
+        if (DebugConfig.isDebug()){
+            mSpeedTv.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    BPRouteDataTestUtils.converToRouteData();
+                    UiThreadHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            updateWayPointList(mStationsList,1);
+                        }
+                    },1000);
+                    return false;
+                }
+            });
+        }
     }
 
     @Override
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
index 7bc2b51727..0ed6ee5692 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
@@ -304,10 +304,11 @@ public class BusPresenter extends Presenter<BusFragment>
     @Override
     public void playPassenger(WriteOffPassenger passenger) {
         int passengerNum = passenger.passengerSize;
-        if (passengerNum > 1){ //多人播报 "x人"
-            VoiceNotice.showNotice(passengerNum+"人", AIAssist.LEVEL3);
-        }else { //是 1 播放 "滴"
-            mView.playDI();
+        if (passengerNum > 1){ //多人播报 "x人" ---》x人核验通过
+            VoiceNotice.showNotice(passengerNum+"人核验通过", AIAssist.LEVEL3);
+        }else { //是 1 播放 "滴" 2022.11.09 改为： "核验通过"
+//            mView.playDI();
+            VoiceNotice.showNotice("核验通过", AIAssist.LEVEL3);
         }
     }
 }