From ac8b4164ba7cd148ec270c80dd5a63a8736e2485 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Fri, 17 Mar 2023 18:00:04 +0800
Subject: [PATCH 01/27] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[?=
 =?UTF-8?q?=201=E3=80=81=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=96=91=E9=A9=AC?=
 =?UTF-8?q?=E7=BA=BF=E4=BF=AE=E6=94=B9=E4=BA=86=E9=AB=98=E5=BE=B7=E5=9D=90?=
 =?UTF-8?q?=E6=A0=87=E7=B3=BB=E7=9A=84=E8=87=AA=E8=BD=A6=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=EF=BC=8C=E5=85=B6=E5=AE=83=E5=9C=B0=E6=96=B9?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=BC=82=E5=B8=B8=E3=80=82=20]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../eagle/core/data/map/MogoLocation.java     | 44 ++++++++++++
 ...llerChassisLocationGCJ02ListenerManager.kt | 68 +++++++++----------
 ...llerChassisLocationWGS84ListenerManager.kt |  2 +-
 .../java/com/mogo/map/AMapViewWrapper.java    | 24 +------
 4 files changed, 80 insertions(+), 58 deletions(-)

diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java
index 03a70a4bbc..33c4fb5091 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java
@@ -324,6 +324,50 @@ public class MogoLocation implements Cloneable {
         return this;
     }
 
+    public MogoLocation copy(MogoLocation lastLocation, double longitude, double latitude) {
+        MogoLocation mogoLocation = new MogoLocation();
+        mogoLocation.accuracy = lastLocation.accuracy;
+        mogoLocation.adCode = lastLocation.adCode;
+        mogoLocation.address = lastLocation.address;
+        mogoLocation.aoiName = lastLocation.aoiName;
+        mogoLocation.buildingId = lastLocation.buildingId;
+        mogoLocation.cityCode = lastLocation.cityCode;
+        mogoLocation.cityName = lastLocation.cityName;
+        mogoLocation.description = lastLocation.description;
+        mogoLocation.district = lastLocation.district;
+        mogoLocation.errorCode = lastLocation.errorCode;
+        mogoLocation.errorInfo = lastLocation.errorInfo;
+        mogoLocation.floor = lastLocation.floor;
+        mogoLocation.gpsAccuracyStatus = lastLocation.gpsAccuracyStatus;
+        mogoLocation.lastReceiveTime = lastLocation.lastReceiveTime;
+        mogoLocation.locationDetail = lastLocation.locationDetail;
+        mogoLocation.locType = lastLocation.locType;
+        mogoLocation.poiName = lastLocation.poiName;
+        mogoLocation.provider = lastLocation.provider;
+        mogoLocation.province = lastLocation.province;
+        mogoLocation.satellite = lastLocation.satellite;
+        mogoLocation.street = lastLocation.street;
+        mogoLocation.streetNum = lastLocation.streetNum;
+
+        MessagePad.GnssInfo gnssInfo =
+                MessagePad.GnssInfo.newBuilder()
+                        .setLongitude(longitude) //经度
+                        .setLatitude(latitude)//纬度
+                        .setAltitude(lastLocation.gnssInfo.getAltitude())  //海拔
+                        .setHeading(lastLocation.gnssInfo.getHeading())  //航向角
+                        .setAcceleration(lastLocation.gnssInfo.getAcceleration())  //加速度
+                        .setYawRate(lastLocation.gnssInfo.getYawRate()) //曲率
+                        .setGnssSpeed(lastLocation.gnssInfo.getGnssSpeed())  //惯导车速 m/s
+                        .setVehicleSpeed(lastLocation.gnssInfo.getVehicleSpeed()) //车辆车速 m/s
+                        .setSatelliteTime(lastLocation.gnssInfo.getSatelliteTime()) //gps时间 单位：秒s
+                        .setSystemTime(lastLocation.gnssInfo.getSystemTime())  //系统时间 单位：秒s
+                        .build();
+
+        mogoLocation.gnssInfo = gnssInfo;
+        return mogoLocation;
+    }
+
+
     public long getLastReceiveTime() {
         return lastReceiveTime;
     }
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt
index 4b62d2a1bf..00240c86bf 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt
@@ -19,7 +19,7 @@ object CallerChassisLocationGCJ02ListenerManager : CallerBase<IMoGoChassisLocati
     private const val TAG = "CallerChassisLocationGCJ20ListenerManager"
 
     @Volatile
-    private var mGnssInfo: MogoLocation? = null
+    private var mGnssInfo: MogoLocation = MogoLocation()
 
     /**
      * 添加监听并指定回掉频率
@@ -36,8 +36,8 @@ object CallerChassisLocationGCJ02ListenerManager : CallerBase<IMoGoChassisLocati
         setListenerHz(tag, callBackHz)
     }
 
-    fun getChassisLocationGCJ02(): MogoLocation? {
-        return mGnssInfo
+    fun getChassisLocationGCJ02(): MogoLocation {
+        return mGnssInfo.clone()
     }
 
     /**
@@ -47,46 +47,42 @@ object CallerChassisLocationGCJ02ListenerManager : CallerBase<IMoGoChassisLocati
     @Synchronized
     fun invokeChassisLocationGCJ02(gnssInfo: MogoLocation?, sourceType: DataSourceType) {
         gnssInfo?.let {
-            // 克隆定位数据，防止原数据被篡改导致位置跳变
-            mGnssInfo = gnssInfo.clone()
             // 转换 WGS84-->GCJ02 坐标
             val gcj20Location =
                 CoordinateTransform.WGS84ToGCJ02(gnssInfo.longitude, gnssInfo.latitude)
-            mGnssInfo?.let {
-                mGnssInfo!!.longitude = gcj20Location[0]
-                mGnssInfo!!.latitude = gcj20Location[1]
+            // 克隆定位数据，防止原数据被篡改导致位置跳变
+            mGnssInfo = gnssInfo.copy(gnssInfo, gcj20Location[0], gcj20Location[1])
 
-                M_LISTENERS.forEach {
-                    val tag = it.key
-                    // 获取数据监听需要的HZ
-                    val hz = M_LISTENERS_HZ[tag]
-                    if (hz != null && hz > 0) {
-                        val hzTime = (1.0 / hz.toDouble()) * 1000
-                        // 获取最后一次回调的时间
-                        val hzLastSendTime = M_LISTENERS_HZ_LAST_SEND_TIME[tag]
-                        if (hzLastSendTime != null && hzLastSendTime > 0) {
-                            // 计算是否进入下一次回调周期
-                            val nowTime = TimeUtils.getNowMills()
-                            if (nowTime - hzLastSendTime > hzTime) {
-                                syncLocationCallback(tag, it, mGnssInfo!!, sourceType)
-                            }
-                        } else {
-                            syncLocationCallback(tag, it, mGnssInfo!!, sourceType)
+            M_LISTENERS.forEach {
+                val tag = it.key
+                // 获取数据监听需要的HZ
+                val hz = M_LISTENERS_HZ[tag]
+                if (hz != null && hz > 0) {
+                    val hzTime = (1.0 / hz.toDouble()) * 1000
+                    // 获取最后一次回调的时间
+                    val hzLastSendTime = M_LISTENERS_HZ_LAST_SEND_TIME[tag]
+                    if (hzLastSendTime != null && hzLastSendTime > 0) {
+                        // 计算是否进入下一次回调周期
+                        val nowTime = TimeUtils.getNowMills()
+                        if (nowTime - hzLastSendTime > hzTime) {
+                            syncLocationCallback(tag, it, mGnssInfo, sourceType)
                         }
                     } else {
-                        //Logger.d(TAG, "没设置监听频率，使用默认5HZ")
-                        val hzTime = (1.0 / 5) * 1000
-                        // 获取最后一次回调的时间
-                        val hzLastSendTime = M_LISTENERS_HZ_LAST_SEND_TIME[tag]
-                        if (hzLastSendTime != null && hzLastSendTime > 0) {
-                            // 计算是否进入下一次回调周期
-                            val nowTime = TimeUtils.getNowMills()
-                            if (nowTime - hzLastSendTime > hzTime) {
-                                syncLocationCallback(tag, it, mGnssInfo!!, sourceType)
-                            }
-                        } else {
-                            syncLocationCallback(tag, it, mGnssInfo!!, sourceType)
+                        syncLocationCallback(tag, it, mGnssInfo, sourceType)
+                    }
+                } else {
+                    //Logger.d(TAG, "没设置监听频率，使用默认5HZ")
+                    val hzTime = (1.0 / 5) * 1000
+                    // 获取最后一次回调的时间
+                    val hzLastSendTime = M_LISTENERS_HZ_LAST_SEND_TIME[tag]
+                    if (hzLastSendTime != null && hzLastSendTime > 0) {
+                        // 计算是否进入下一次回调周期
+                        val nowTime = TimeUtils.getNowMills()
+                        if (nowTime - hzLastSendTime > hzTime) {
+                            syncLocationCallback(tag, it, mGnssInfo, sourceType)
                         }
+                    } else {
+                        syncLocationCallback(tag, it, mGnssInfo, sourceType)
                     }
                 }
             }
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationWGS84ListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationWGS84ListenerManager.kt
index 7c38e0fad2..6c2465f0d9 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationWGS84ListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationWGS84ListenerManager.kt
@@ -17,7 +17,7 @@ object CallerChassisLocationWGS84ListenerManager : CallerBase<IMoGoChassisLocati
     private var mGnssInfo: MogoLocation = MogoLocation()
 
     fun getChassisLocationWGS84(): MogoLocation {
-        return mGnssInfo
+        return mGnssInfo.clone()
     }
 
     /**
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
index 806d4d75f7..28e073fa61 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
@@ -24,7 +24,6 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
-import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 
 import com.mogo.commons.debug.DebugConfig;
@@ -34,7 +33,7 @@ import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.data.map.MapRoadInfo;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager;
 import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager;
@@ -212,28 +211,11 @@ public class AMapViewWrapper implements IMogoMapView,
 
     @Override
     public void onStopLineInfo(@androidx.annotation.Nullable StopLine stopLine) {
-        MogoLocation carLoc = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02();
+        MogoLocation carLoc = CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84();
         if (stopLine != null && stopLine.road_id != null && !stopLine.road_id.isEmpty() && stopLine.points != null && stopLine.points.size() > 0) {
             ArrayList<LonLatPoint> points = stopLine.points;
             if (carLoc != null) {
-                /**
-                 *  //地图组提供的高德坐标切到WGS84坐标系
-                 *  var cal = LonLatPoint(point!!.lon, point!!.lat)
-                 *         if(!point!!.provider.equals(MapAutoApi.GPS_FLAG)){
-                 *             cal = MapTools.switchLonLatWGS84(cal)
-                 *         }
-                 */
-                String provider = carLoc.getProvider();
-                //CallerLogger.INSTANCE.d(M_MAP + TAG, "car_loc: " + carLoc + "");
-                if (!MapAutoApi.GPS_FLAG.equals(provider)) {
-                    //CallerLogger.INSTANCE.d(M_MAP + TAG, "convert before: car_loc: {lon: " + carLoc.getLongitude() + ", lat: " + carLoc.getLatitude() + "}");
-                    LonLatPoint p = new LonLatPoint(carLoc.getLongitude(), carLoc.getLatitude());
-                    p = MapTools.INSTANCE.switchLonLatWGS84(p);
-                    carLoc.setLongitude(p.longitude);
-                    carLoc.setLatitude(p.latitude);
-                    //CallerLogger.INSTANCE.d(M_MAP + TAG, "convert after: car_loc: {lon: " + carLoc.getLongitude() + ", lat: " + carLoc.getLatitude() + "}");
-                }
-                //CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}");
+//                //CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}");
                 MapRoadInfo.StopLine stopInfo = convert(stopLine);
                 LonLatPoint p1 = points.get(0);
                 LonLatPoint p2 = points.get(points.size() - 1);

From 0cced718cf5add4825b8c29095362e9edd5b9615 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 17 Mar 2023 22:19:08 +0800
Subject: [PATCH 02/27] =?UTF-8?q?[M2]=20=E6=8E=A5=E9=A9=B3/M2=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97=E5=B9=B3=E5=9D=87?=
 =?UTF-8?q?=E8=BD=A6=E9=80=9F=E8=AE=BE=E4=B8=BA10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/model/BusPassengerModel.java    | 11 ++++++++++-
 .../mogo/och/bus/passenger/model/PM2DrivingModel.kt   |  2 +-
 .../och/bus/passenger/constant/BusPassengerConst.kt   |  2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 1dab9a42e5..7c3188a307 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -494,7 +494,8 @@ public class BusPassengerModel {
                 }else {
                     lastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength(lastPoints);
                 }
-                double lastTime = lastSumLength / BusPassengerConst.BUS_AVERAGE_SPEED * 3.6 ; //秒
+
+                double lastTime = lastSumLength / getAverageSpeed() * 3.6 ; //秒
                 CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==lastSumLength = " + lastSumLength);
                 if (mAutopilotPlanningCallback != null){
                     mAutopilotPlanningCallback.routePlanningToNextStationChanged((long)lastSumLength,(long) lastTime);
@@ -503,6 +504,14 @@ public class BusPassengerModel {
         }
     }
 
+    public int getAverageSpeed(){
+        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
+            return BusPassengerConst.SHUTTLE_AVERAGE_SPEED;
+        }else {
+            return BusPassengerConst.BUS_AVERAGE_SPEED;
+        }
+    }
+
     public void startRemainRouteInfo() {
         //开启实时计算剩余距离，剩余时间，预计时间
         startOrStopCalculateRouteInfo(true);
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
index 49643dc157..9435100f7f 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
@@ -443,7 +443,7 @@ class PM2DrivingModel private constructor() {
                 } else {
                     CoordinateCalculateRouteUtil.calculateRouteSumLength(lastPoints)
                 }
-                val lastTime = lastSumLength / BusPassengerConst.BUS_AVERAGE_SPEED * 3.6 //秒
+                val lastTime = lastSumLength / BusPassengerConst.SHUTTLE_AVERAGE_SPEED * 3.6 //秒
                 d(SceneConstant.M_BUS_P + TAG, "och-rotting==lastSumLength = $lastSumLength")
                 mDrivingInfoCallback?.updateRemainMT(
                         lastSumLength.toLong(),
diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
index f2f8552625..88fbdc0127 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
@@ -27,6 +27,8 @@ class BusPassengerConst {
 
         //bus平均速度 bus的平均里程：25km/h
         const val BUS_AVERAGE_SPEED = 25
+        //接驳/B2平均速度 bus的平均里程：10km/h
+        const val SHUTTLE_AVERAGE_SPEED = 10
 
         // 订单总里程
         const val BUS_SP_KEY_ORDER_SUM_DIS = "BUS_SP_KEY_ORDER_SUM_DIS"

From 5df38df0c9ed2bfbeb8eea3771dd56f32019d794 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 17 Mar 2023 22:35:34 +0800
Subject: [PATCH 03/27] =?UTF-8?q?[shuttle]=20=E4=B9=98=E5=AE=A2=E5=B1=8F?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=92=8C=E5=8F=B8=E6=9C=BA=E7=AB=AF=E6=96=AD?=
 =?UTF-8?q?=E8=BF=9E=EF=BC=8C=E6=8B=BF=E4=B8=8D=E5=88=B0=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AFsn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/passenger/model/BusPassengerModel.java   | 4 ++++
 .../och/bus/passenger/network/BusPassengerServiceManager.kt   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 7c3188a307..86b8d49ca2 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -194,6 +194,10 @@ public class BusPassengerModel {
 
                     @Override
                     public void onFail(int code, String msg) {
+                        if (BusPassengerServiceManager.INSTANCE.getDriverAppSn().isEmpty()){
+                            //此处拦截是为了防止过程中乘客屏和司机端断连，拿不到司机端sn, 造成请求失败去刷新了界面
+                            return;
+                        }
                         if (code == 1003){
                             routesResult = null;
                             startOrStopCalculateRouteInfo(false);
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
index caf58e1ed9..9a44ec6518 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
@@ -28,7 +28,7 @@ object BusPassengerServiceManager {
      * 获取Bus司机端的sn
      * @return
      */
-    private val driverAppSn: String
+    public val driverAppSn: String
         get() = getServerToken()
 
     /**

From d313ac52b9214c6bd19e28187e568e21c6550b1f Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 17 Mar 2023 23:36:21 +0800
Subject: [PATCH 04/27] =?UTF-8?q?[shuttle/M1]=201=E3=80=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E8=BF=90=E8=90=A5=E6=B6=88=E6=81=AF=E5=8D=95=E5=8F=91?=
 =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8Fbug=20=202=E3=80=81=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/bus/model/OrderModel.java   | 12 +++++++-----
 .../magic/mogo/och/charter/model/DriverM1Model.kt | 15 +++++++++------
 .../src/main/res/values/strings.xml               |  2 +-
 .../biz/common/socketmessage/data/SystemMsg.kt    |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java
index 42f1e48fee..bc2f8186b1 100644
--- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java
@@ -231,16 +231,18 @@ public class OrderModel {
                     CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+obj.getContext());
                     List<Integer> list = obj.getScreenList();
                     CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+GsonUtils.toJson(list));
-                    if ( list!= null && list.size() > 1){
+
+                    if (list != null && list.contains(1)){ // 1司机端
+                        OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(),
+                                obj.getContext(),OCHSocketMessageManager.OPERATION_SYSTEM);
+                    }
+
+                    if (list != null && list.contains(2)){ //乘客屏
                         AppConnectMsg msg = new AppConnectMsg(true,false,obj.getContext());
                         CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,
                                 GsonUtils.toJson(msg).getBytes());
                     }
 
-                    OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(),
-                            obj.getContext(),OCHSocketMessageManager.OPERATION_SYSTEM);
-
-
                 }
             };
 
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
index 55e296f75e..3a99ad95a6 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -16,10 +16,6 @@ import com.magic.mogo.och.charter.callback.DriverM1OrderCallback
 import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback
 import com.magic.mogo.och.charter.constant.CharterConst
 import com.magic.mogo.och.charter.manager.CharterAnalyticsManager
-import com.mogo.och.common.module.manager.CharterSendTripInfoManager
-import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STATION
-import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP
-import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP
 import com.magic.mogo.och.charter.manager.CharterTrajectoryManager
 import com.magic.mogo.och.charter.net.DriverM1ServiceManager
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener
@@ -50,6 +46,10 @@ import com.mogo.och.common.module.biz.provider.LoginService
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager.startLoopAbnormalFactors
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager.stopLoopAbnormalFactors
+import com.mogo.och.common.module.manager.CharterSendTripInfoManager
+import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STATION
+import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP
+import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP
 import com.mogo.och.common.module.manager.OCHAdasAbilityManager
 import com.mogo.och.common.module.utils.*
 import io.reactivex.exceptions.UndeliverableException
@@ -252,9 +252,12 @@ class DriverM1Model {
 
                 d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.context)
 
-                pushOperationalToMsgBox(obj.pushTimeStamp, obj.context)
                 val list = obj.screenList
-                if (list.size > 1){ //发送乘客屏
+                d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + GsonUtils.toJson(list))
+                if (list != null && list.contains(1)){ // 司机端
+                    pushOperationalToMsgBox(obj.pushTimeStamp, obj.context)
+                }
+                if (list != null && list.contains(2)){ //发送乘客屏
                     sendMsgToClient(DPCommonOperationMsg(obj.context))
                 }
 
diff --git a/OCH/mogo-och-charter/src/main/res/values/strings.xml b/OCH/mogo-och-charter/src/main/res/values/strings.xml
index 47ca830c1c..46f95b6556 100644
--- a/OCH/mogo-och-charter/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-charter/src/main/res/values/strings.xml
@@ -26,7 +26,7 @@
 <!--    <string name="bus_arrive_to_end_title">去往下车地点</string>-->
     <string name="bus_arrive_to_end_start">起点：</string>
     <string name="bus_arrive_to_end_end">终点：</string>
-    <string name="bus_arrive_to_current_tag">当前站点：</string>
+    <string name="bus_arrive_to_current_tag">出发站点：</string>
     <string name="bus_arrive_to_next_tag1">目的站点：</string>
     <string name="bus_arrive_to_next_tag">下一站：</string>
     <string name="bus_auto_disable_tip">自动驾驶状态为0不可用</string>
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt
index b30bef39a2..f321b2c108 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt
@@ -5,7 +5,7 @@ package com.mogo.och.common.module.biz.common.socketmessage.data
  */
 data class SystemMsg(
     var context: String,
-    var screenList: MutableList<Int>,
+    var screenList: MutableList<Int>,//1:司机屏  2:乘客屏
     var pushTimeStamp: Long = System.currentTimeMillis() // 消息下发时间戳
 )
 

From c65a28d35fe6194fa09474dbe3582c069494173c Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@gmail.com>
Date: Sat, 18 Mar 2023 13:07:04 +0800
Subject: [PATCH 05/27] =?UTF-8?q?[M1]=20[=E8=BD=A8=E8=BF=B9=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E8=AE=A1=E7=AE=97]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/CharterPassengerModel.kt  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index 236b44cf29..c62c6dc1e4 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -84,7 +84,7 @@ object CharterPassengerModel {
         ConcurrentHashMap<String, IBusPassengerControllerStatusCallback>()
 
     // 当前位置坐标
-    private var mLocation: MogoLocation? = null
+    private var mLocationGCJ02: MogoLocation? = null
     private var mLocationWgs: MogoLocation? = null
 
     // 订单信息 有订单有线路结束订单
@@ -194,7 +194,7 @@ object CharterPassengerModel {
         object : IMoGoChassisLocationGCJ02Listener {
             override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) {
                 if (null == mogoLocation) return
-                mLocation = mogoLocation
+                mLocationGCJ02 = mogoLocation
                 for (callback in mControllerStatusCallbackMap.values) {
                     callback.onCarLocationChanged(mogoLocation)
                 }
@@ -368,9 +368,7 @@ object CharterPassengerModel {
                         order.wgs84Lon!!,
                         order.wgs84Lat!!
                     )
-                order.gcj02Lon = coordinateConverterWgsToGcj.longitude
-                order.gcj02Lat = coordinateConverterWgsToGcj.latitude
-                this.carTypeChageListener?.setEndStationCallBack(order.siteId,order.siteName,order.gcj02Lon!!,order.gcj02Lat!!)
+                this.carTypeChageListener?.setEndStationCallBack(order.siteId,order.siteName,coordinateConverterWgsToGcj.longitude,coordinateConverterWgsToGcj.latitude)
             }
             this.orderInfo?.orderNo?.let {
                 if(it!=orderData.orderNo){
@@ -389,7 +387,7 @@ object CharterPassengerModel {
                     setOrderStatus(OrderStatusEnum.OrdersWithLine)
                 }
                 //计算终点距离
-                mLocation?.let { currentInfo ->
+                mLocationGCJ02?.let { currentInfo ->
                     // 两点之间的距离
                     val coordinateConverterWgsToGcj =
                         CoordinateCalculateRouteUtil.coordinateConverterWgsToGcj(
@@ -397,13 +395,11 @@ object CharterPassengerModel {
                             order.wgs84Lon!!,
                             order.wgs84Lat!!
                         )
-                    order.gcj02Lon = coordinateConverterWgsToGcj.longitude
-                    order.gcj02Lat = coordinateConverterWgsToGcj.latitude
                     val calculateLineDistance = CoordinateUtils.calculateLineDistance(
                         currentInfo.longitude,
                         currentInfo.latitude,
-                        order.gcj02Lon!!,
-                        order.gcj02Lat!!
+                        coordinateConverterWgsToGcj.longitude,
+                        coordinateConverterWgsToGcj.latitude
                     )
                     // 小于15m到站
                     if (calculateLineDistance < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE) {
@@ -629,7 +625,7 @@ object CharterPassengerModel {
      */
     private fun calculateDistance() {
         //mLocation gcj坐标
-        mLocation?.let {
+        mLocationGCJ02?.let {
             // 启动轨迹计算
             //当前站在轨迹中对应的点
             val currentRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew(
@@ -696,7 +692,7 @@ object CharterPassengerModel {
         var distanceMap: MutableMap<Float, Int> = TreeMap()
         // 计算所有点的距离
         data.forEachIndexed { index, siteInfo ->
-            mLocation?.let { currentInfo ->
+            mLocationGCJ02?.let { currentInfo ->
                 // 两点之间的距离
                 val calculateLineDistance = CoordinateUtils.calculateLineDistance(
                     currentInfo.longitude,
@@ -744,7 +740,7 @@ object CharterPassengerModel {
             if(middle==0){
                 return Pair(1, false)
             }
-            mLocation?.let {
+            mLocationGCJ02?.let {
                 // 仅计算 距离最近的站点middle  附近5个坐标的夹角
                 // middle middle-1
                 // middle middle+1
@@ -891,7 +887,7 @@ object CharterPassengerModel {
             CallerLogger.e(M_BUS_P + TAG, "no order or order is empty.")
             return null
         }
-        mLocation?.let {
+        mLocationGCJ02?.let {
 
         }
         val parameters = AutopilotControlParameters()

From ad8478a7202919fe54eb6b5fb9df8a04f5ab959b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@gmail.com>
Date: Sat, 18 Mar 2023 13:24:34 +0800
Subject: [PATCH 06/27] =?UTF-8?q?[M1]=20[=E8=BD=A8=E8=BF=B9=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/model/CharterPassengerModel.kt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index c62c6dc1e4..fedfe4f303 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -633,9 +633,17 @@ object CharterPassengerModel {
             )
             //要前往的站在轨迹中对应的点
             var nextRouteIndex: Int = mRoutePoints.size - 1
-            orderInfo?.let {
+            orderInfo?.let {order->
+                val coordinateConverterWgsToGcj =
+                    CoordinateCalculateRouteUtil.coordinateConverterWgsToGcj(
+                        mContext,
+                        order.wgs84Lon!!,
+                        order.wgs84Lat!!
+                    )
                 nextRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew(
-                    currentRouteIndex, mRoutePoints, it.gcj02Lon!!, it.gcj02Lat!!
+                    currentRouteIndex, mRoutePoints,
+                    coordinateConverterWgsToGcj.longitude,
+                    coordinateConverterWgsToGcj.latitude
                 )
             }
             var lastSumLength = 0f

From bd8612a00027f2e635d7765565989d48c5d96464 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 20 Mar 2023 11:26:08 +0800
Subject: [PATCH 07/27] =?UTF-8?q?[m1]=20[=E8=AE=A1=E7=AE=97=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E8=B7=9D=E7=A6=BB=E4=BC=98=E5=8C=96]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/CharterPassengerModel.kt  | 91 +++++++++++++------
 1 file changed, 65 insertions(+), 26 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index fedfe4f303..cf44b22aa5 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -626,43 +626,82 @@ object CharterPassengerModel {
     private fun calculateDistance() {
         //mLocation gcj坐标
         mLocationGCJ02?.let {
-            // 启动轨迹计算
-            //当前站在轨迹中对应的点
-            val currentRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew(
-                0, mRoutePoints, it.longitude, it.latitude
-            )
-            //要前往的站在轨迹中对应的点
-            var nextRouteIndex: Int = mRoutePoints.size - 1
-            orderInfo?.let {order->
-                val coordinateConverterWgsToGcj =
+            var lastSumLength = 0f
+            orderInfo?.let { order ->
+                // 启动轨迹计算
+                //当前站在轨迹中对应的点
+                val currentRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew(
+                    0, mRoutePoints, it.longitude, it.latitude
+                )
+                var nextRouteIndex: Int = mRoutePoints.size - 1
+
+                val orderLonLat =
                     CoordinateCalculateRouteUtil.coordinateConverterWgsToGcj(
                         mContext,
                         order.wgs84Lon!!,
                         order.wgs84Lat!!
                     )
+                //要前往的站在轨迹中对应的点
                 nextRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew(
                     currentRouteIndex, mRoutePoints,
-                    coordinateConverterWgsToGcj.longitude,
-                    coordinateConverterWgsToGcj.latitude
+                    orderLonLat.longitude,
+                    orderLonLat.latitude
                 )
-            }
-            var lastSumLength = 0f
-            if (currentRouteIndex < nextRouteIndex) {
-                // subList 是[)  需要的是[]
-                val subList = mRoutePoints.subList(currentRouteIndex, nextRouteIndex+1)
-                val middlePoingDistancee =
-                    CoordinateCalculateRouteUtil.calculateRouteSumLength(subList)
-                val lastPoints = mRoutePoints.get(currentRouteIndex)
-                lastSumLength = CoordinateUtils.calculateLineDistance(
-                    lastPoints.longitude, lastPoints.latitude,
-                    it.longitude, it.latitude
-                ) + middlePoingDistancee
-            } else {
+                // 距离站点最近的轨迹点
                 val lastPoints = mRoutePoints.get(nextRouteIndex)
-                lastSumLength = CoordinateUtils.calculateLineDistance(
+                // 站点距离最近点的距离
+                val calculateLineDistance = CoordinateUtils.calculateLineDistance(
                     lastPoints.longitude, lastPoints.latitude,
-                    it.longitude, it.latitude
+                    orderLonLat.longitude, orderLonLat.latitude
                 )
+                if (currentRouteIndex < nextRouteIndex) {
+                    // subList 是[)  需要的是[]
+                    val subList = mRoutePoints.subList(currentRouteIndex, nextRouteIndex + 1)
+                    // 轨迹点所有的距离
+                    val middlePoingDistancee =
+                        CoordinateCalculateRouteUtil.calculateRouteSumLength(subList)
+
+                    // 需要加距离 和下一个轨迹点成钝角
+                    if (nextRouteIndex + 1 < mRoutePoints.size) {
+                        val lastPointsNext = mRoutePoints.get(nextRouteIndex + 1)
+                        val degree = CoordinateCalculateRouteUtil.getDegree(
+                            orderLonLat.longitude,orderLonLat.latitude,
+                            lastPoints.longitude, lastPoints.latitude,
+                            lastPointsNext.longitude, lastPointsNext.latitude,
+                        )
+                        if (degree > 90) {
+                            lastSumLength = middlePoingDistancee + calculateLineDistance
+                        }
+                    }
+                    // 需要减距离 和上一个轨迹点成钝角
+                    if (nextRouteIndex - 1 >= 0) {
+                        val lastPointsPre = mRoutePoints.get(nextRouteIndex - 1)
+                        val degree = CoordinateCalculateRouteUtil.getDegree(
+                            orderLonLat.longitude,orderLonLat.latitude,
+                            lastPoints.longitude, lastPoints.latitude,
+                            lastPointsPre.longitude, lastPointsPre.latitude,
+                        )
+                        if (degree > 90) {
+                            lastSumLength = middlePoingDistancee - calculateLineDistance
+                        }
+                    }
+
+                } else {
+                    val lastPoints = mRoutePoints.get(nextRouteIndex)
+                    lastSumLength = CoordinateUtils.calculateLineDistance(
+                        lastPoints.longitude, lastPoints.latitude,
+                        it.longitude, it.latitude
+                    )
+                }
+                // 距离小于100m 直接计算当前位置距离站点的距离
+                if(lastSumLength<=100){
+                    lastSumLength = CoordinateUtils.calculateLineDistance(
+                        orderLonLat.longitude,
+                        orderLonLat.latitude,
+                        it.longitude,
+                        it.latitude
+                    )
+                }
             }
             val lastTime: Double = lastSumLength / Charter_AVERAGE_SPEED * 3.6 //秒
 

From c4c665d92747ed683581432ae344b31e6d8d0995 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Mon, 20 Mar 2023 15:09:42 +0800
Subject: [PATCH 08/27] [m1-p-1.1.0] fix bug of system view to get map citycode

---
 .../eagle/core/function/hmi/ui/widget/SystemVersionView.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
index 52281e673c..1418bac233 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
@@ -141,7 +141,12 @@ class SystemVersionView @JvmOverloads constructor(
             }
         }
 
-        updateHDDataCacheStatus(CallerMapUIServiceManager.isCityDataCached())
+        ThreadUtils.getIoPool().execute {
+            val isCached = CallerMapUIServiceManager.isCityDataCached()
+            UiThreadHandler.post {
+                updateHDDataCacheStatus(isCached)
+            }
+        }
 
         if(AdUpgradeStateHelper.isConfirmUpgrade()){
             //将角标改为“下载中”

From 7eeabea7d168946491cf82367e39d18dbefe9d25 Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Mon, 20 Mar 2023 17:11:56 +0800
Subject: [PATCH 09/27] =?UTF-8?q?[obu]=E5=8D=87=E7=BA=A7OBU=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.gradle b/config.gradle
index dc2bd1e3d3..c2c71ebf9c 100644
--- a/config.gradle
+++ b/config.gradle
@@ -93,7 +93,7 @@ ext {
 
             // obu sdk
             obusdk                       : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
-            mogoobu                      : 'com.mogo.support.obu:mogo-obu:1.1.0_beta4',
+            mogoobu                      : 'com.mogo.support.obu:mogo-obu:1.1.0_beta5',
 
             // google
             googlezxing                  : "com.google.zxing:core:3.3.3",

From 2e81da9be4f389d2abe058b43e5ce2a634a4f90d Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Mon, 20 Mar 2023 19:24:48 +0800
Subject: [PATCH 10/27] =?UTF-8?q?[dev=5Frobobus-m1-p-app-module=5F1.1.0=5F?=
 =?UTF-8?q?230112=5F1.1.0]=20=E6=89=93=E5=BC=80rsm=E7=9A=84=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/hmi/ui/setting/SOPSettingView.kt     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
index 8861936c58..6284a390bf 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -73,11 +73,11 @@ internal class SOPSettingView @JvmOverloads constructor(
         /**
          * obu弱势交通控制
          */
-//        tbObuWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowObuWeaknessTrafficView
-//        tbObuWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
-//            // 默认开启
-//            HmiBuildConfig.isShowObuWeaknessTrafficView = !isChecked
-//        }
+        tbObuWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowObuWeaknessTrafficView
+        tbObuWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
+            // 默认开启
+            HmiBuildConfig.isShowObuWeaknessTrafficView = !isChecked
+        }
 
         /**
          * 云端弱势交通控制

From ab08a8c597e8993705f3320ca39038dd794571f0 Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Mon, 20 Mar 2023 19:25:31 +0800
Subject: [PATCH 11/27] =?UTF-8?q?[delivery]1.=E5=A4=A7=E7=90=86/=E7=83=9F?=
 =?UTF-8?q?=E5=8F=B0=E9=A1=B9=E7=9B=AE=EF=BC=9A=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=9F=9F=E5=90=8D=E9=85=8D=E7=BD=AE=EF=BC=88=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8online=E6=89=93=E5=8C=85=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/urlConfig.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/urlConfig.json b/app/urlConfig.json
index e25afd4187..f05fe5d46e 100644
--- a/app/urlConfig.json
+++ b/app/urlConfig.json
@@ -39,13 +39,13 @@
       "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/"
     },
     "online": {
-      "och_url": "https://och-a.zhidaozhixing.com",
-      "shuttle_url": "https://och-a.zhidaozhixing.com",
-      "passport_url": "https://och-a.zhidaozhixing.com/arch/passport/",
-      "socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/",
-      "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
-      "eagle_mis_url": "http://och-hailing-eh.zhidaozhixing.com:18181/",
-      "eagle_dns_url": "http://och-hailing-eh.zhidaozhixing.com:18181/"
+      "och_url": "https://och-driver-eh.zhidaozhixing.com:18182",
+      "shuttle_url": "https://och-driver-eh.zhidaozhixing.com:18182",
+      "passport_url": "https://och-driver-eh.zhidaozhixing.com:18182/arch/passport/",
+      "socket_base_url": "https://och-driver-eh.zhidaozhixing.com:18182/arch/push/",
+      "socket_tech_url": "https://och-driver-eh.zhidaozhixing.com:18182/arch/",
+      "eagle_mis_url": "https://och-hailing-eh.zhidaozhixing.com:18182/",
+      "eagle_dns_url": "https://och-hailing-eh.zhidaozhixing.com:18182/"
     },
     "demo": {
       "och_url": "https://och-a.zhidaozhixing.com",
@@ -68,13 +68,13 @@
       "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/"
     },
     "online": {
-      "och_url": "https://och-a.zhidaozhixing.com",
-      "shuttle_url": "https://och-a.zhidaozhixing.com",
-      "passport_url": "https://och-a.zhidaozhixing.com/arch/passport/",
-      "socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/",
-      "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
-      "eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
-      "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/"
+      "och_url": "https://och-driver-yt.zhidaozhixing.com",
+      "shuttle_url": "https://och-driver-yt.zhidaozhixing.com",
+      "passport_url": "https://och-driver-yt.zhidaozhixing.com/arch/passport/",
+      "socket_base_url": "https://och-driver-yt.zhidaozhixing.com/arch/push/",
+      "socket_tech_url": "https://och-driver-yt.zhidaozhixing.com/arch/",
+      "eagle_mis_url": "https://och-hailing-yt.zhidaozhixing.com/",
+      "eagle_dns_url": "https://och-hailing-yt.zhidaozhixing.com/"
     },
     "demo": {
       "och_url": "https://och-a.zhidaozhixing.com",

From c5687763a10a14ae9b3ff5473171d1838a2876cf Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Mon, 20 Mar 2023 19:41:48 +0800
Subject: [PATCH 12/27] =?UTF-8?q?[m2][fix]=E8=A7=A3=E5=86=B3=E5=BF=83?=
 =?UTF-8?q?=E8=B7=B3=E5=8C=85=E5=8D=8F=E8=AE=AE=E4=B8=8D=E5=AF=B9=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=95=BF=E8=BF=9E=E6=96=AD=E5=BC=80=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6be651f447..db8144bdb9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4
 LOGLIB_VERSION=1.5.11
 ######## MogoAiCloudSDK Version ########
 # 网络请求LOGLIB_VERSION
-MOGO_NETWORK_VERSION=1.4.5.12
+MOGO_NETWORK_VERSION=1.4.6.4
 # 鉴权
-MOGO_PASSPORT_VERSION=1.4.5.12
+MOGO_PASSPORT_VERSION=1.4.6.4
 # 常链接
-MOGO_SOCKET_VERSION=1.4.5.12
+MOGO_SOCKET_VERSION=1.4.6.4
 # 数据采集
-MOGO_REALTIME_VERSION=1.4.5.12
+MOGO_REALTIME_VERSION=1.4.6.4
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.4.5.12
+MOGO_TANLU_VERSION=1.4.6.4
 # 直播推流
-MOGO_LIVE_VERSION=1.4.5.12
+MOGO_LIVE_VERSION=1.4.6.4
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.4.5.12
+MOGO_TRAFFICLIVE_VERSION=1.4.6.4
 # 定位服务
-MOGO_LOCATION_VERSION=1.4.5.12
+MOGO_LOCATION_VERSION=1.4.6.4
 # 远程通讯模块
-MOGO_TELEMATIC_VERSION=1.4.5.12
+MOGO_TELEMATIC_VERSION=1.4.6.4
 ######## MogoAiCloudSDK Version ########
 # 自研地图
 MAP_SDK_VERSION=2.10.0.9

From b34e2715f45f3ce997236a625dc7164586afe23b Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 20 Mar 2023 19:56:48 +0800
Subject: [PATCH 13/27] =?UTF-8?q?[m1]=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=AE=9A=E6=97=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/setting/SOPSettingView.kt | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
index 6284a390bf..db71c709e7 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -234,29 +234,29 @@ internal class SOPSettingView @JvmOverloads constructor(
             FuncBizConfig.FOUNDATION, TAG, true, this
         )
         // 开启定时查询速度
-        Timer().schedule(timerTaskRefresh, Date(), 500)
+//        Timer().schedule(timerTaskRefresh, Date(), 500)
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         // 移除 业务配置监听
         CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(FuncBizConfig.FOUNDATION, TAG)
-        try {
-            timerTaskRefresh.cancel()
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
+//        try {
+//            timerTaskRefresh.cancel()
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//        }
     }
 
-    private val timerTaskRefresh = object : TimerTask(){
-        override fun run() {
-            UiThreadHandler.post{
-                tbDemoMode.isChecked = FunctionBuildConfig.isDemoMode
-                tbRainMode.isChecked = FunctionBuildConfig.isRainMode
-            }
-        }
-
-    }
+//    private val timerTaskRefresh = object : TimerTask(){
+//        override fun run() {
+//            UiThreadHandler.post{
+//                tbDemoMode.isChecked = FunctionBuildConfig.isDemoMode
+//                tbRainMode.isChecked = FunctionBuildConfig.isRainMode
+//            }
+//        }
+//
+//    }
 
     override fun updateBizView(type: String, lock: Boolean) {
         when (type) {

From ec702e64f3ca0852bdd96c326965c00b5a0384a0 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 20 Mar 2023 20:15:43 +0800
Subject: [PATCH 14/27] =?UTF-8?q?[m1]=20[v2x+=E9=80=9A=E7=9F=A5]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presenter/BusPassengerPresenter.kt        |  39 ++++++++++++++----
 .../src/m1/res/layout/m1_main_fragment.xml    |  14 +++++++
 .../src/m1/res/raw/m1_voice_di.mp3            | Bin 0 -> 85687 bytes
 3 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 OCH/mogo-och-charter-passenger/src/m1/res/raw/m1_voice_di.mp3

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
index 57668063df..66e15fcea8 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
@@ -20,12 +20,16 @@ import com.mogo.och.bus.passenger.model.CharterPassengerModel
 import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener
 import com.mogo.och.bus.passenger.model.OrderStatusEnum
 import com.mogo.och.bus.passenger.ui.MainFragment
+import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
 import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg
+import com.mogo.och.common.module.bean.dpmsg.DPCommonOperationMsg
 import com.mogo.och.common.module.bean.dpmsg.DPMsgType
+import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
 import com.mogo.och.common.module.biz.constant.OchCommonConst
 import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.NumberFormatUtil
+import com.mogo.och.common.module.utils.SoundPoolHelper
 import io.reactivex.disposables.Disposable
 import java.util.*
 
@@ -86,21 +90,40 @@ class BusPassengerPresenter(view: MainFragment?) :
                 if (type == OchCommonConst.BUSINESS_STRING) {
                     val msg = GsonUtils.fromJson(
                         String(byteArray),
-                        ChangeDestMsg::class.java
-                    ) as ChangeDestMsg
-                    if (msg.type == DPMsgType.TYPE_OPEN_CLOSE_DOOR.type) {
-                        val doorStatus = OCHM1LightAirconditionDoorStatusManager.doorStatus
-                        if(doorStatus.isOpen){
-                            closeDoor()
-                        }else{
-                            openDoor()
+                        BaseDPMsg::class.java
+                    ) as BaseDPMsg
+                    when (msg.type) {
+                        DPMsgType.TYPE_OPEN_CLOSE_DOOR.type -> {
+                            val doorStatus = OCHM1LightAirconditionDoorStatusManager.doorStatus
+                            if(doorStatus.isOpen){
+                                closeDoor()
+                            }else{
+                                openDoor()
+                            }
                         }
+                        DPMsgType.TYPE_COMMON.type -> {
+                            val msg = GsonUtils.fromJson(
+                                String(byteArray),
+                                DPCommonOperationMsg::class.java
+                            ) as DPCommonOperationMsg
+                            pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp(),msg.msg)
+                        }
+                        else -> {}
                     }
                 }
             }
         }
     }
 
+    fun pushOperationalToMsgBox(time : Long,content : String,type: Int = -1){
+        playDI()
+        OCHSocketMessageManager.pushAppOperationalMsgBox(time, content, type)
+    }
+
+    private fun playDI(){
+        SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di)
+    }
+
     fun openDoor() {
         val canOpenOrCloseDoor = canOpenOrCloseDoor()
         if(!canOpenOrCloseDoor.isNullOrEmpty()){
diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml
index 4bc6e8fc23..52c5eeaf30 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml
+++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml
@@ -37,6 +37,20 @@
         app:layout_constraintTop_toTopOf="@+id/mapBizView"
         app:layout_constraintBottom_toBottomOf="@+id/mapBizView" />
 
+    <!--浓雾预警动画-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.V2XFogEventView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <!--V2X预警红色边框-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.V2XWarningView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <!--pnc行为决策-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
         android:layout_width="wrap_content"
diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1_voice_di.mp3 b/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1_voice_di.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..1cb2d50b0547d3d95e65f7c376177ca2f0c6924c
GIT binary patch
literal 85687
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

literal 0
HcmV?d00001


From 9f93f234d2eb082b739b7cfa35dacf1837635cd4 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 20 Mar 2023 21:02:39 +0800
Subject: [PATCH 15/27] =?UTF-8?q?[m1]=20[recycleview=20=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/ui/M1SoftFragment.kt    | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
index 94b964ac25..e4aff84aaf 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
@@ -55,6 +55,7 @@ class M1SoftFragment :
 
     private var currentTemperature: Temperature? = null
 
+    private var subscribeAir: Disposable? = null
     private var subscribeLightTop1: Disposable? = null
     private var subscribeLightTop2: Disposable? = null
     private var subscribeAtmosphere: Disposable? = null
@@ -239,26 +240,26 @@ class M1SoftFragment :
         rv_aircondition_temperature.layoutManager = pickerLayoutManager
         rv_aircondition_temperature.adapter = adapter
         HorizontalDecoration.distance = SharedPrefsMgr.getInstance(requireContext()).getInt(HorizontalDecoration.distancekey,0)
-        rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(15,data.size-1))
+        rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(20,data.size-1))
 
         pickerLayoutManager.setOnScrollStopListener { view ->
             if (view is TextView) {
                 // 未拖到中点、自动滚动到中点会短时间触发两次
-                if (ClickUtils.isClickTooFrequent(rv_aircondition_temperature)) {
-                    return@setOnScrollStopListener
-                }
                 val tag = view.tag
                 if (tag is Temperature) {
-                    adapter.setCheckIndex(tag.index)
-                    currentTemperature = tag
-                    if(rv_aircondition_temperature.tag== touchTag){
-                        rv_aircondition_temperature.tag = null
-                        return@setOnScrollStopListener
+                    mPresenter?.disposeSubscribe(subscribeAir)
+                    if(tag.index==0||tag.index==adapter.data.size-1){
+                        subscribeAir = Observable.timer(200, TimeUnit.MILLISECONDS)
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe {
+                                setCheckAir(adapter,tag)
+                            }
                     }else {
-                        SoundPoolHelper.getSoundPoolHelper()
-                            .playSoundWithRedId(context, R.raw.bus_di)
+                        if (ClickUtils.isClickTooFrequent(rv_aircondition_temperature)) {
+                            return@setOnScrollStopListener
+                        }
+                        setCheckAir(adapter,tag)
                     }
-                    openAircondition()
                 }
 
             }
@@ -269,6 +270,19 @@ class M1SoftFragment :
         }
     }
 
+    private fun setCheckAir(adapter:TemperatureAdapter,tag:Temperature){
+        adapter.setCheckIndex(tag.index)
+        currentTemperature = tag
+        if (rv_aircondition_temperature.tag == touchTag) {
+            rv_aircondition_temperature.tag = null
+            return
+        } else {
+            SoundPoolHelper.getSoundPoolHelper()
+                .playSoundWithRedId(context, R.raw.bus_di)
+        }
+        openAircondition()
+    }
+
     private fun getData(): MutableList<Temperature> {
         val mutableListOf = mutableListOf<Temperature>()
         mutableListOf.add(Temperature(0, 16, "16°"))

From 0d340f2581de07418815fc699de4f0a06eb3de1d Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 20 Mar 2023 21:03:39 +0800
Subject: [PATCH 16/27] =?UTF-8?q?[m1]=20[=E7=BA=BF=E7=A8=8B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/passenger/utils/VoiceFocusManager.kt  | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt
index f301d97dad..4544adf90a 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt
@@ -3,29 +3,38 @@ package com.mogo.och.bus.passenger.utils
 import android.os.Build
 import androidx.annotation.RequiresApi
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.shuyu.gsyvideoplayer.GSYVideoManager
 
 object VoiceFocusManager {
     @RequiresApi(Build.VERSION_CODES.O)
     fun getVoiceCmdCallBack():IMogoVoiceCmdCallBack{
-        GSYVideoManager.onPause()
-        GSYVideoManager.instance().curPlayerManager?.setNeedMute(true)
+        UiThreadHandler.post {
+            GSYVideoManager.onPause()
+            GSYVideoManager.instance().curPlayerManager?.setNeedMute(true)
+        }
 
         return object : IMogoVoiceCmdCallBack{
 
             override fun onSpeakEnd(speakText: String?) {
-                GSYVideoManager.instance().curPlayerManager?.setNeedMute(false)
-                GSYVideoManager.onResume()
+                UiThreadHandler.post {
+                    GSYVideoManager.instance().curPlayerManager?.setNeedMute(false)
+                    GSYVideoManager.onResume()
+                }
             }
 
             override fun onSpeakError(speakText: String?, errorMsg: String?) {
-                GSYVideoManager.instance().curPlayerManager?.setNeedMute(false)
-                GSYVideoManager.onResume()
+                UiThreadHandler.post {
+                    GSYVideoManager.instance().curPlayerManager?.setNeedMute(false)
+                    GSYVideoManager.onResume()
+                }
             }
 
             override fun onSpeakSelectTimeOut(speakText: String?) {
-                GSYVideoManager.instance().curPlayerManager?.setNeedMute(false)
-                GSYVideoManager.onResume()
+                UiThreadHandler.post {
+                    GSYVideoManager.instance().curPlayerManager?.setNeedMute(false)
+                    GSYVideoManager.onResume()
+                }
             }
         }
     }

From 6e2f9f732c778ce317fc61f810a0a287cb25cf2b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 20 Mar 2023 21:07:48 +0800
Subject: [PATCH 17/27] =?UTF-8?q?[m1]=20[=E6=97=B6=E9=97=B4=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt   | 4 ++++
 .../mogo/och/bus/passenger/view/statusbar/StatusBarView.kt    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
index 7db3fc7eff..932bd2f659 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
@@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
 import com.mogo.eagle.core.utilcode.kotlin.*
+import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.och.bus.passenger.R
 import kotlinx.android.synthetic.m2.p_m2_view_status_bar.view.*
 import kotlinx.coroutines.*
@@ -84,6 +85,9 @@ class M2StatusBarView @JvmOverloads constructor(
 
     @SuppressLint("SetTextI18n")
     override fun onBatteryManagementSystemStates(states: ChassisStatesOuterClass.BMSSystemStates) {
+        if (ClickUtils.isClickTooFrequent(this,1000)) {
+            return
+        }
         val bmsSoc = states.bmsSoc
         try {
             if (oldBmsSoc != bmsSoc ) {
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
index 874ab28db5..4433384526 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
@@ -17,6 +17,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
 import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
+import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.R
 import kotlinx.android.synthetic.m1.m1_statusview_datetime.view.*
@@ -83,6 +84,9 @@ class StatusBarView @JvmOverloads constructor(
     }
 
     override fun onBatteryManagementSystemStates(states: ChassisStatesOuterClass.BMSSystemStates) {
+        if (ClickUtils.isClickTooFrequent(this,1000)) {
+            return
+        }
         UiThreadHandler.post {
             val bmsSoc = states.bmsSoc
             progress.progress = bmsSoc.toInt()

From a1017f79819bb02471aad95cdb0f56b6c6ed2665 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@gmail.com>
Date: Tue, 21 Mar 2023 07:56:37 +0800
Subject: [PATCH 18/27] =?UTF-8?q?[M1]=20[=E8=B6=85=E6=97=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
index f12224dcda..bc91b24827 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
@@ -289,7 +289,7 @@ class LineSiteView @JvmOverloads constructor(
                     LoopInfo(3, ::checkServerStatus)
                 )
                 RxUtils.disposeSubscribe(subscribeSelectLine)
-                subscribeSelectLine= RxUtils.createSubscribe(120_1000){
+                subscribeSelectLine= RxUtils.createSubscribe(120_000){
                     ToastUtils.showShort("请联系安全员确认")
                     endAni()
                 }
@@ -323,7 +323,7 @@ class LineSiteView @JvmOverloads constructor(
                 LoopInfo(3, ::checkServerStatus)
             )
             RxUtils.disposeSubscribe(subscribeSelectSite)
-            subscribeSelectSite = RxUtils.createSubscribe(120_1000){
+            subscribeSelectSite = RxUtils.createSubscribe(120_000){
                 ToastUtils.showShort("请联系安全员确认")
                 endAni()
             }

From 3fc6417afa3db8e9d6a888a46f17aad24dcb1c27 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 21 Mar 2023 10:51:51 +0800
Subject: [PATCH 19/27] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=B0=83=E8=AF=95=E9=9D=A2=E6=9D=BF=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/setting/SOPSettingView.kt  | 18 ++++--------------
 .../src/main/res/layout/view_sop_setting.xml   | 16 ----------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
index db71c709e7..e6bb0e1390 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.setting
 
 import android.content.Context
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -71,20 +72,18 @@ internal class SOPSettingView @JvmOverloads constructor(
         }
 
         /**
-         * obu弱势交通控制
+         * obu弱势交通控制, 默认开启
          */
         tbObuWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowObuWeaknessTrafficView
         tbObuWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
-            // 默认开启
-            HmiBuildConfig.isShowObuWeaknessTrafficView = !isChecked
+            HmiBuildConfig.isShowObuWeaknessTrafficView = isChecked
         }
 
         /**
-         * 云端弱势交通控制
+         * 云端弱势交通控制  默认关闭
          */
         tbCloudWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowCloudWeaknessTrafficView
         tbCloudWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
-            // 默认关闭
             HmiBuildConfig.isShowCloudWeaknessTrafficView = isChecked
         }
 
@@ -93,7 +92,6 @@ internal class SOPSettingView @JvmOverloads constructor(
          */
         tbObuV2vView.isChecked = HmiBuildConfig.isShowObuV2vView
         tbObuV2vView.setOnCheckedChangeListener { _, isChecked ->
-            // 默认关闭
             HmiBuildConfig.isShowObuV2vView = isChecked
         }
 
@@ -105,14 +103,6 @@ internal class SOPSettingView @JvmOverloads constructor(
             HmiBuildConfig.isShowObuV2iView = isChecked
         }
 
-        /**
-         * obu 数据通过dc 传输V2i事件 开关 TODO pm确定下开关功能 HmiBuildConfig.isShowObuToDcV2iView
-         */
-        tbObuToDcView.setOnCheckedChangeListener { _, isChecked ->
-            // 默认开启
-            HmiBuildConfig.isShowObuToDcV2iView = !isChecked
-        }
-
         //红绿灯标识
         tbTrafficLight.isChecked = HmiBuildConfig.isShowTrafficLightView
         tbTrafficLight.setOnCheckedChangeListener { _, isChecked ->
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
index cb84b6d654..3ccfc31835 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
@@ -163,22 +163,6 @@
         app:layout_constraintRight_toRightOf="parent"
         />
 
-    <!--这个后面产品会统一去掉-->
-    <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/tbObuToDcView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="OBU到工控机V2I显示"
-        android:visibility="gone"
-        android:paddingTop="25dp"
-        android:paddingBottom="25dp"
-        android:scaleY="1.2"
-        android:scaleX="1.2"
-        app:layout_constraintTop_toBottomOf="@id/tbObuV2vView"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
-        />
-
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/tbObuWeaknessTrafficSop"
         android:layout_width="wrap_content"

From 08eacd81a02da8a95734ffc8103100ee2d994a92 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Tue, 21 Mar 2023 11:08:56 +0800
Subject: [PATCH 20/27] =?UTF-8?q?[m1]=20=E7=8A=B6=E6=80=81=E6=A0=8F?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=94=B5=E9=87=8F=E8=BF=9B=E5=BA=A6=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E6=8B=96=E5=8A=A8=EF=BC=8C=E6=BB=91=E5=8A=A8=E4=B8=8D?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91=E5=9C=B0=E5=9B=BE=E8=A7=86=E8=A7=92=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/view/statusbar/StatusBarView.kt     | 2 ++
 .../src/m1/res/layout/m1_statusview_datetime.xml          | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
index 4433384526..9c9abbefc2 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
@@ -37,6 +37,8 @@ class StatusBarView @JvmOverloads constructor(
     init {
         LayoutInflater.from(context).inflate(R.layout.m1_statusview_datetime, this, true)
         setBackgroundColor(ContextCompat.getColor(context,R.color.bus_p_m1_80ffffff))
+        isClickable = true
+        isFocusable = true
     }
 
     override fun onAttachedToWindow() {
diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_datetime.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_datetime.xml
index 807d9df45c..b3f84e633f 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_datetime.xml
+++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_datetime.xml
@@ -46,8 +46,9 @@
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/dp_32" />
 
-    <SeekBar
+    <ProgressBar
         android:id="@+id/progress"
+        style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="@dimen/dp_115"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_40"
@@ -57,9 +58,8 @@
         app:layout_constraintStart_toEndOf="@+id/blueToothView"
         android:maxHeight="@dimen/dp_10"
         android:minHeight="@dimen/dp_10"
-        android:splitTrack="false"
-        android:progressDrawable="@drawable/taxi_video_seekbar_style"
-        android:thumb="@null" />
+        android:background="@null"
+        android:progressDrawable="@drawable/taxi_video_seekbar_style" />
 
     <TextView
         android:id="@+id/tv_power_cos"

From 250dc3e206443de59496e6a3edbe41c768916077 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 21 Mar 2023 11:49:51 +0800
Subject: [PATCH 21/27] =?UTF-8?q?[shuttle/M2/M1]=20=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5"=E8=98=91=E8=8F=87?=
 =?UTF-8?q?=E8=BD=A6=E8=81=94"=E8=AF=BB=E6=88=90"=E8=98=91=E8=8F=87?=
 =?UTF-8?q?=E8=BD=A6=20=20=E8=81=94"=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OCH/mogo-och-common-module/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OCH/mogo-och-common-module/src/main/res/values/strings.xml b/OCH/mogo-och-common-module/src/main/res/values/strings.xml
index 62410a2fde..94cc6ad34a 100644
--- a/OCH/mogo-och-common-module/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-common-module/src/main/res/values/strings.xml
@@ -27,7 +27,7 @@
     <string name="surplus5_order_en">There are 5 minutes left from the end of chartering. Please arrange your time reasonably</string>
     <string name="surplus5_order_ko">전세버스 종료 후 5분 남았습니다. 여행 시간을 합리적으로 안배해 주십시오</string>
 
-    <string name="end_order_zh">感谢您体验蘑菇车联自动驾驶小巴车，本次旅程已结束，我们下次乘车再见</string>
+    <string name="end_order_zh">感谢您体验\'蘑菇车联\'自动驾驶小巴车，本次旅程已结束，我们下次乘车再见</string>
     <string name="end_order_en">Thank you for experiencing the self-driving minibus. See you next time</string>
     <string name="end_order_ko">자율주행 버스를 체험해 주셔서 감사합니다. 다음에 또 뵙겠습니다</string>
 </resources>
\ No newline at end of file

From 1492df10b642dfe8a788ef1484c0cd8d876148ed Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 21 Mar 2023 12:28:33 +0800
Subject: [PATCH 22/27] =?UTF-8?q?[m1]=20[=E5=88=B0=E7=AB=99=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E8=B7=AF=E7=AE=97]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/passenger/model/CharterPassengerModel.kt  | 2 ++
 .../m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index cf44b22aa5..8033d9a606 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -864,6 +864,8 @@ object CharterPassengerModel {
                                     broadcastList["${it}$endKey"] = true
                                     // 到站结束自驾
                                     CallerAutoPilotControlManager.cancelAutoPilot()
+                                    // 结束路距计算
+                                    endCalculateDistanceLoop()
                                     // 到站置距离位0
                                     iDistanceTimeCallback?.setOrderTimeCallBack(-1)
                                 }
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
index e4aff84aaf..34aff80614 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
@@ -240,7 +240,8 @@ class M1SoftFragment :
         rv_aircondition_temperature.layoutManager = pickerLayoutManager
         rv_aircondition_temperature.adapter = adapter
         HorizontalDecoration.distance = SharedPrefsMgr.getInstance(requireContext()).getInt(HorizontalDecoration.distancekey,0)
-        rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(20,data.size-1))
+        val space = AutoSizeUtils.dp2px(context, 22f)
+        rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(space,data.size-1))
 
         pickerLayoutManager.setOnScrollStopListener { view ->
             if (view is TextView) {

From 50fa2136735f8666db5ff2268bb1b425ec97c88f Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 21 Mar 2023 13:10:13 +0800
Subject: [PATCH 23/27] =?UTF-8?q?[M2/shuttle]=20=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=BD=AE=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/passenger/model/BusPassengerModel.java    | 7 +++++--
 .../com/mogo/och/bus/passenger/model/PM2DrivingModel.kt    | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 86b8d49ca2..aeacef126c 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -141,6 +141,7 @@ public class BusPassengerModel {
                     public void onSuccess(BusPassengerOperationStatusResponse data) {
                         if (data == null || data.data == null) return;
                         if (mDriverStatusCallback != null) {
+                            CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverOperationStatus = %s", data.data.plateNumber );
                             mDriverStatusCallback.changeOperationStatus(data.data.driverStatus == 1);
                             mDriverStatusCallback.updatePlateNumber(data.data.plateNumber);
                         }
@@ -194,6 +195,10 @@ public class BusPassengerModel {
 
                     @Override
                     public void onFail(int code, String msg) {
+                        CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg );
+                        if (code == 1003){
+                            queryDriverOperationDelay();
+                        }
                         if (BusPassengerServiceManager.INSTANCE.getDriverAppSn().isEmpty()){
                             //此处拦截是为了防止过程中乘客屏和司机端断连，拿不到司机端sn, 造成请求失败去刷新了界面
                             return;
@@ -201,10 +206,8 @@ public class BusPassengerModel {
                         if (code == 1003){
                             routesResult = null;
                             startOrStopCalculateRouteInfo(false);
-                            queryDriverOperationDelay();
                             return;
                         }
-                        CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg );
                     }
                 });
     }
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
index 9435100f7f..60f012ba68 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
@@ -324,6 +324,10 @@ class PM2DrivingModel private constructor() {
                     }
 
                     override fun onFail(code: Int, msg: String?) {
+                        d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg)
+                        if (code == 1003){
+                            queryDriverOperationDelay()
+                        }
                         if (PM2ServiceManager.driverAppSn.isEmpty()){
                             return
                         }
@@ -331,10 +335,8 @@ class PM2DrivingModel private constructor() {
                             routesResult = null
                             isGoingToNextStation = false
                             startOrStopCalculateRouteInfo(false)
-                            queryDriverOperationDelay()
                             return
                         }
-                        d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg)
                     }
 
                 })

From e46be4a0b30a0e53f5bba6f7ecd23bc260d07e64 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Tue, 21 Mar 2023 17:05:50 +0800
Subject: [PATCH 24/27] =?UTF-8?q?[m2][fix]=E7=A7=91=E5=A4=A7=E8=AE=AF?=
 =?UTF-8?q?=E9=A3=9E=E9=BB=98=E8=AE=A4=E5=8F=91=E9=9F=B3=E4=BA=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=B9=B6=E6=8F=90=E9=AB=98=E9=9F=B3=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt b/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt
index 5180d5e305..ba0dfa497b 100644
--- a/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt
+++ b/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt
@@ -24,7 +24,7 @@ class IFlyTekTts : IMogoTTS, InitListener {
     private var ttsEngine: SpeechSynthesizer? = null
     private var engineType = SpeechConstant.TYPE_CLOUD
 
-    private var voicer: String = "xiaoyan"
+    private var voicer: String = "x4_lingxiaoying_en"
     private var voicerEntries: Array<String>? = null
 
     // 等级由低到高为0、1、2、3，默认为-1表示没有正在tts的
@@ -389,7 +389,7 @@ class IFlyTekTts : IMogoTTS, InitListener {
             )
             //设置合成音量
             ttsEngine?.setParameter(
-                SpeechConstant.VOLUME, "50"
+                SpeechConstant.VOLUME, "100"
             )
         } else {
             ttsEngine?.setParameter(SpeechConstant.ENGINE_TYPE, SpeechConstant.TYPE_LOCAL)

From bafceb6c4fea33b9298dd56e1dcd03eab8b1aa0c Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 21 Mar 2023 18:16:11 +0800
Subject: [PATCH 25/27] =?UTF-8?q?[m1]=20[=E5=80=92=E8=AE=A1=E6=97=B6]=20[?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B0=E7=AB=99=E8=AE=B0=E5=BD=95=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=9A1=E3=80=81=E5=BA=95=E7=9B=98=E4=BC=A0=E9=80=922?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BD=AE=E8=AE=AD3=E8=B7=9D=E7=A6=BB?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA(=E6=96=B0=E5=A2=9E)]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/model/CharterPassengerModel.kt     | 3 +++
 .../com/mogo/och/bus/passenger/ui/view/LineSiteView.kt   | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index 8033d9a606..f0be5f21dc 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -710,6 +710,9 @@ object CharterPassengerModel {
                 "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime
                         + " thread = " + Thread.currentThread().name
             )
+            if (lastSumLength < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE) {
+                arriveDest()
+            }
             iDistanceTimeCallback?.setDistancecAndTime(lastSumLength.toLong(), lastTime.toLong())
         }
     }
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
index bc91b24827..d037c0db7e 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
@@ -255,6 +255,11 @@ class LineSiteView @JvmOverloads constructor(
                     TAGLINELOOP,
                     LoopInfo(3, ::checkServerStatus)
                 )
+                RxUtils.disposeSubscribe(subscribeSelectLine)
+                subscribeSelectLine= RxUtils.createSubscribe(120_000){
+                    ToastUtils.showShort("请联系安全员确认")
+                    endAni()
+                }
             }
         }
         tv_site_submit.onClick {
@@ -288,8 +293,8 @@ class LineSiteView @JvmOverloads constructor(
                     TAGLINELOOP,
                     LoopInfo(3, ::checkServerStatus)
                 )
-                RxUtils.disposeSubscribe(subscribeSelectLine)
-                subscribeSelectLine= RxUtils.createSubscribe(120_000){
+                RxUtils.disposeSubscribe(subscribeSelectSite)
+                subscribeSelectSite = RxUtils.createSubscribe(120_000){
                     ToastUtils.showShort("请联系安全员确认")
                     endAni()
                 }

From ab2d990fa43f0a5f8f9dec69664bf0a1b22b5a1d Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Wed, 22 Mar 2023 11:10:39 +0800
Subject: [PATCH 26/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=87=BA=E9=94=99=E5=AF=BC=E8=87=B4=20m1?=
 =?UTF-8?q?=E6=A1=A3=E4=BD=8D=E5=AF=B9=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6?=
 =?UTF-8?q?=E6=9C=89=E9=99=90=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/productFlavors/ochPassengerM1.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/productFlavors/ochPassengerM1.gradle b/app/productFlavors/ochPassengerM1.gradle
index 2121de231e..67af2a0def 100644
--- a/app/productFlavors/ochPassengerM1.gradle
+++ b/app/productFlavors/ochPassengerM1.gradle
@@ -49,7 +49,7 @@ project.android.productFlavors {
         // 构建 是否支持多屏异显异交互
         buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
 
-        //Bus不能启动自驾的档位
-        buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}'
+        //M1不能启动自驾的档位
+        buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null'
     }
 }
\ No newline at end of file

From 1329cb4d0d168e2935e22d1c66d933c62d6e43aa Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Wed, 22 Mar 2023 11:16:17 +0800
Subject: [PATCH 27/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/README.md b/app/README.md
index 71338949e3..4235943673 100644
--- a/app/README.md
+++ b/app/README.md
@@ -48,5 +48,5 @@
 |   金旅小巴    |   fOchBus.gradle、fOchBusPassenger.gradle、fOchShuttle.gradle、fOchShuttlePassenger.gradle   |   N、R   |   buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}'   |
 |   M1   |   fOchBusPassengerM1.gradle   |   不限制档位   |   buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null'   |
 |   M2   |   fOchBusPassengerM2.gradle   |   N、P、R   |   buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}'   |
-|   清扫车   |   fOchSweeper.gradle   |   N   |   buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);}}'   |
+|   清扫车   |   fOchSweeper.gradle   |   不限制档位   |   buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null'   |
 |   开沃   |   暂无   |   不限制档位   |   buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null'   |