Merge branch 'dev_robotaxi-d_230612_3.3.0' into dev_saasbus-d_230607_from3.2.0

2023-07-07 18:16:59 +08:00
parent c88e86e4ac 47275eab1e
commit 27afd4d429
18 changed files with 338 additions and 114 deletions
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
@@ -46,6 +46,11 @@ public class MogoOCHBusPassenger implements IMogoOCH {
        this.mActivity = activity;
        this.mContainerId = containerId;
        showFragment();
+
+        if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
+            MultiDisplayUtils.INSTANCE.startActWithSecond(activity, VideoPlayerActivity.class);
+        }
+
        return null;
    }

--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
@@ -177,14 +177,14 @@ object BusPassengerModel{
                            routesResult = null
                            mNextStationIndex = 0
                        }
-                        cleanStation()
+                        cleanStation("queryDriverSiteByCoordinate")
                        if (mRouteLineInfoCallback != null) {
                            mRouteLineInfoCallback!!.showNoTaskView()
                        }
                        mRoutePoints.clear()
                        return
                    }
-                    if (routesResult != null && data.result == routesResult) {
+                    if (routesResult != null && data.result.equals(routesResult)) {
                        d(M_BUS_P + TAG, "order = queryDriverSiteByCoordinate = not update")
                        return
                    }
@@ -206,7 +206,7 @@ object BusPassengerModel{
                    }
                    if (code == 1003) {
                        routesResult = null
-                        cleanStation()
+                        cleanStation("queryDriverSiteByCoordinate 1003")
                        return
                    }
                }
@@ -229,16 +229,16 @@ object BusPassengerModel{
                        mRouteLineInfoCallback!!.updateStationsInfo(stations, i + 1, false)
                        if (mNextStationIndex != i + 1) {
                            mTwoStationsRouts.clear()
-                            val startStation = mStations[i]
-                            val endStation = mStations[i + 1]
-                            setTrajectoryStation(startStation, endStation, result.lineId)
                        }
                        mNextStationIndex = i + 1
+                        val startStation = mStations[i]
+                        val endStation = mStations[i + 1]
+                        setTrajectoryStation(startStation, endStation, result.lineId)
                        updateAutopilotControlParameters(result, i)
                        return
                    } else if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && !station.isLeaving) { //到站
                        if (i == stations.size - 1) {
-                            cleanStation()
+                            cleanStation("updatePassengerRouteInfo最后一个站点")
                        }
                        suspendCalculate()

@@ -309,7 +309,7 @@ object BusPassengerModel{

    fun release() {
        releaseListeners()
-        cleanStation()
+        cleanStation("release")
        startOrStopOrderLoop(false)
    }

@@ -600,7 +600,8 @@ object BusPassengerModel{
        setStationPoint(startStation, endStation, lineId.toLong())
    }

-    fun cleanStation() {
+    fun cleanStation(type:String) {
+        d(M_BUS_P + TAG, "清理站点 $type")
        setStationPoint(null, null, -1L)
    }

--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
@@ -67,9 +67,9 @@
    <com.mogo.eagle.core.function.hmi.ui.msgbox.BusPassengerMsgBoxBubbleView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        app:layout_constraintRight_toLeftOf="@+id/bus_p_route_panel"
+        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginRight="@dimen/dp_40"
+        android:layout_marginLeft="@dimen/dp_40"
        android:layout_marginTop="@dimen/dp_100"
        />

--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
@@ -41,7 +41,8 @@
            android:id="@+id/driver_info_bg"
            android:layout_width="@dimen/bus_p_route_info_panel_width"
            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/busPLineMapView"
+            android:layout_marginBottom="@dimen/bus_p_route_line_map_view_height"
+            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintRight_toRightOf="parent"
            app:layout_constraintTop_toTopOf="parent">

--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -462,9 +462,9 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     * 展示【自动驾驶】按钮
     */
    public void showAutopilotBiz() {
-        getActivity().runOnUiThread(() -> {
-            ctvAutopilotStatus.setVisibility(View.VISIBLE);
-        });
+//        getActivity().runOnUiThread(() -> {
+//            ctvAutopilotStatus.setVisibility(View.VISIBLE);
+//        });
    }

    public SlidePanelView.OnSlidePanelMoveToEndListener getSlidePanelOnEndListener() {
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
@@ -50,7 +50,6 @@ public class BusPresenter extends Presenter<BusFragment>

    private static final String TAG = "BusPresenter";

-    private volatile int currentAutopilotStatus = -1;
    private final List<BusStationBean> mStationList = new ArrayList<>();
    private int mCurrentStation = 0;

@@ -97,16 +96,12 @@ public class BusPresenter extends Presenter<BusFragment>
    }

    public void autoDriveToNextStation() {
-        currentAutopilotStatus = -1;
        OrderModel.getInstance().autoDriveToNextStation();
-//        isRestartAutopilot = false;
    }

    public void restartAutopilot() {
        if (OrderModel.getInstance().isGoingToNextStation()){
-            currentAutopilotStatus = -1;
            OrderModel.getInstance().restartAutopilot();
-//            isRestartAutopilot = true;
        }
    }

@@ -167,49 +162,7 @@ public class BusPresenter extends Presenter<BusFragment>
    public void onAutopilotStatusResponse(int state) {
        switch (state) {
            case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE:
-                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
-                    // 设置UI【自动驾驶】按钮是否展示
-                    runOnUIThread(() -> mView.onAutopilotEnableChange(true));
-                }
-                if (FunctionBuildConfig.isDemoMode
-                        && (
-                        (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1)
-                                && OrderModel.getInstance().isGoingToNextStation()
-                )
-                ) {
-                    CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
-                    return;
-                }
-                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
-                    currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE;
-                }
-                // 改变UI自动驾驶状态
-                runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus));
-                break;
-            case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING:
-                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
-                    currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING;
-                    OrderModel.getInstance().triggerStartServiceEvent(
-                            OrderModel.getInstance().isRestartAutopilot(), true);
-                }
-                // 改变UI自动驾驶状态
-                runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus));
-                break;
            case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE:
-                if (FunctionBuildConfig.isDemoMode
-                        && (
-                        (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1)
-                                && OrderModel.getInstance().isGoingToNextStation()
-                )
-                ) {
-                    CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
-                    return;
-                }
-                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) {
-                    currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE;
-                }
-                runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus));
-                break;
            case IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING:
                if (FunctionBuildConfig.isDemoMode
                        && (
@@ -220,10 +173,14 @@ public class BusPresenter extends Presenter<BusFragment>
                    CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
                    return;
                }
-                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING) {
-                    currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING;
-                }
-                runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus));
+                // 改变UI自动驾驶状态
+                runOnUIThread(() -> mView.onAutopilotStatusChanged(state));
+                break;
+            case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING:
+                OrderModel.getInstance().triggerStartServiceEvent(
+                            OrderModel.getInstance().isRestartAutopilot(), true);
+                // 改变UI自动驾驶状态
+                runOnUIThread(() -> mView.onAutopilotStatusChanged(state));
                break;
            default:
                runOnUIThread(() -> mView.onAutopilotEnableChange(false));
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
@@ -56,6 +56,8 @@ object  TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{

    @Volatile
    private var mRoutePoints: MutableList<MogoLocation>? = ArrayList()
+    private var mRoutePointsDistance: MutableList<Float>? = ArrayList()
+    private var maxDistanceAllPoint:Double = 0.0

    @Volatile
    private var lineId:Long? = null
@@ -82,7 +84,7 @@ object  TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
            if (it.size > 0) {
                d(M_OCHCOMMON + TAG, "收到轨迹:${it.size}第一个点${it[0]}最后一个点:${it.last()}")
                if(globalPathResp.lineId!=null) {
-                    if (globalPathResp.lineId == lineId) {
+                    if (globalPathResp.lineId == lineId && !mRoutePoints.isNullOrEmpty()) {
                        d(M_OCHCOMMON + TAG, "重复轨迹")
                        startCalculateDistanceLoop()
                        return
@@ -99,9 +101,26 @@ object  TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{

    private fun updateRoutePoints(routePoints: List<MessagePad.Location>?) {
        mRoutePoints = null
+        mRoutePointsDistance = null
        val latLngModels = CoordinateCalculateRouteUtil
            .coordinateConverterWgsToGcjLocations(AbsMogoApplication.getApp(), routePoints!!)
        mRoutePoints = latLngModels
+
+        mRoutePointsDistance = ArrayList()
+        maxDistanceAllPoint = 0.0
+        mRoutePoints?.forEachIndexed { index, current ->
+            if (mRoutePoints!!.last()!=current) {
+                val next = mRoutePoints!![index + 1]
+                val distanceItem = CoordinateUtils.calculateLineDistance(
+                    current.longitude,
+                    current.latitude,
+                    next.longitude,
+                    next.latitude
+                )
+                mRoutePointsDistance?.add(distanceItem)
+                maxDistanceAllPoint += distanceItem
+            }
+        }
    }

    private fun removeTempData() {
@@ -120,16 +139,21 @@ object  TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{

    fun cleanRoutePoints() {
        mRoutePoints = null
+        mRoutePointsDistance = null
    }

    /**
     * 设置或清理站点坐标
     */
    fun setStationPoint(startStationInfo: MogoLocation?,endStationInfo: MogoLocation?,lineId:Long?) {
+        d(M_OCHCOMMON+ TAG,"线路id:${lineId}设置站点：开始站点${startStationInfo}、结束站点：${endStationInfo}")
        if (startStationInfo == null || endStationInfo == null || lineId == -1L) {
            removeTempData()
            endCalculateDistanceLoop()
            cleanRoutePoints()
+            this.endStationInfo.stationPoint = null
+            this.startStationInfo.stationPoint = null
+            this.lineId = null
        }else{
            if(isSameStation(this.startStationInfo.stationPoint,startStationInfo)&&
                isSameStation(this.endStationInfo.stationPoint,endStationInfo)){
@@ -262,12 +286,27 @@ object  TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
            preCarLocationIndexInTrajectory = 0
            return
        }
+
+        var maxDisatance = 0.0f
+        if(carLocationInfo.second==true){
+            if(carLocationInfo.first>0) {
+                maxDisatance = mRoutePointsDistance?.get(carLocationInfo.first - 1)?:0f
+            }
+        }else{
+            maxDisatance = mRoutePointsDistance?.get(carLocationInfo.first)?:0f
+        }
+        if(carLocationInfo.third>maxDisatance){
+            preCarLocationIndexInTrajectory = 0
+            writeLog("到点的距离${carLocationInfo.third},最大距离${maxDisatance}",locationInfo)
+            return
+        }
+
        preCarLocationIndexInTrajectory = carLocationInfo.first

        // 距离回调
        try {
            if(distanceListeners.size>0) {
-                invokeDistance(carLocationInfo, location)
+                invokeDistance(carLocationInfo, location,locationInfo)
            }
        }catch (e:Exception){
            e(M_OCHCOMMON+ TAG,"距离计算错误")
@@ -293,7 +332,11 @@ object  TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
    }


-    private fun invokeDistance(carLocationInfo:Triple<Int,Boolean?,Float>,location: MogoLocation){
+    private fun invokeDistance(
+        carLocationInfo: Triple<Int, Boolean?, Float>,
+        location: MogoLocation,
+        locationInfo: String
+    ){
        var lastSumLength = 0f

        val stationIndex = endStationInfo.index?:0
@@ -321,6 +364,11 @@ object  TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
            )
        }
        d(M_OCHCOMMON+ TAG,"距离终点：$lastSumLength")
+        if(lastSumLength>maxDistanceAllPoint){
+            // 大于最大值需要需要删除此次计算
+            writeLog("距离终点：$lastSumLength",locationInfo)
+            return
+        }
        if(distanceListeners.size>0) {
            distanceListeners.forEach {
                //val tag = it.key
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
@@ -172,7 +172,6 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
            TaxiPassengerModel.getInstance().recoverNaviInfo();
            TaxiPassengerGeocodeSearchModel.getInstance(getContext()).destroyGeocodeSearch();
            TaxiPassengerModel.getInstance().startOrStopReadyToAutopilotLoop(false);
-            clearV2XMarkers();
            TaxiPassengerModel.getInstance().cleanStation();
            return;
        }
@@ -231,7 +230,6 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
                mView.showOrHideArrivedEndLayout(true, order.endSiteAddr,order.orderNo);
                CallerOrderListenerManager.INSTANCE.invokeOrderStatus(false);
            });
-            clearV2XMarkers();
            TaxiPassengerModel.getInstance().cleanStation();
            return;
        }
@@ -239,17 +237,11 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
        if (TaxiPassengerOrderStatusEnum.JourneyCompleted.getCode() == order.orderStatus){
            TaxiPassengerGeocodeSearchModel.getInstance(getContext()).destroyGeocodeSearch();
            mCurrentPassengerOrder = null;
-            clearV2XMarkers();
            TaxiPassengerModel.getInstance().cleanStation();
            return;
        }
    }

-    public void clearV2XMarkers(){
-        //todo 需要调用 overMapView.clearV2XMarkers() 亚坤
-//        CallerSmpManager.clearV2XMarkers();
-    }
-
    public void checkAndUpdateStatus(String phone){
        TaxiPassengerModel.getInstance().checkPhoneAndUpdateStatus(phone, new ITaxiPassengerCommonCallback() {
            @Override
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt
@@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.view.OverMapView
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum
 import com.mogo.och.taxi.passenger.model.TaxiPassengerModel
 import io.reactivex.Observable
@@ -26,23 +27,6 @@ class OverviewFragment : BaseFragment() {

    private var subscribe: Disposable?=null

-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        if (overmapview == null) {
-            overmapview = OverMapView(requireContext())
-        } else {
-            val viewGroup = overmapview?.parent as ViewGroup
-            viewGroup.removeView(overmapview)
-        }
-        overmapview?.onCreateView(savedInstanceState)
-        CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onCreateView")
-        statusChange(TaxiPassengerModel.getInstance().curOrderStatus)
-        return overmapview!!
-    }
-
    override fun onResume() {
        super.onResume()
        overmapview?.onResume()
@@ -80,7 +64,6 @@ class OverviewFragment : BaseFragment() {
                    if(finalVisable2User){
                        CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"已经隐藏")
                        finalVisable2User = false
-                        stopAndClear()
                    }
                }
            }
@@ -111,12 +94,13 @@ class OverviewFragment : BaseFragment() {
        CallerFuncBizManager.bizProvider.stopQueryV2XEvents()
        UiThreadHandler.post({
            overmapview?.clearV2XMarkers()
+            overmapview?.clearCustomPolyline()
        }, UiThreadHandler.MODE.QUEUE)
    }


    override fun getLayoutId(): Int {
-        return 0
+        return R.layout.taxi_p_overmap_fragment
    }

    override fun getTagName(): String {
@@ -127,6 +111,15 @@ class OverviewFragment : BaseFragment() {

    }

+    override fun initViews(savedInstanceState: Bundle?) {
+        super.initViews(savedInstanceState)
+        overmapview = findViewById(R.id.overMapView)
+        overmapview?.onCreateView(savedInstanceState)
+
+        CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onCreateView")
+        statusChange(TaxiPassengerModel.getInstance().curOrderStatus)
+    }
+
    companion object{
        private const val TAG = "OverviewFragment"
        @JvmStatic
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.mogo.eagle.core.function.view.OverMapView
+        android:id="@+id/overMapView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:startPointDrawable="@drawable/taxi_p_map_view_dir_start"
+        app:endPointDrawable="@drawable/taxi_p_map_view_dir_end"
+        app:mapStyleExtraPath="map_style_extra.data"
+        app:mapStylePath="map_style.data" />
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/config/tempConfig.json
+++ b/app/config/tempConfig.json
@@ -28,7 +28,71 @@
        },
        {
          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
+          "title": "5"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
+          "title": "6"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg",
          "type": 0,
+          "cacheImgPath": "",
+          "title": "7"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "8"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "9"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
+          "title": "10"
+        }
+      ]
+    },
+    "buspassengerochjl": {
+      "ads": [
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "1"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "2"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
+          "title": "3"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "4"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v",
+          "type": 1,
          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
          "title": "5"
        },
@@ -110,7 +174,71 @@
        },
        {
          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
+          "title": "5"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
+          "title": "6"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg",
          "type": 0,
+          "cacheImgPath": "",
+          "title": "7"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "8"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "9"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
+          "title": "10"
+        }
+      ]
+    },
+    "buspassengerochjl": {
+      "ads": [
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "1"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "2"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
+          "title": "3"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "4"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v",
+          "type": 1,
          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
          "title": "5"
        },
@@ -180,6 +308,22 @@
        }
      ]
    },
+    "buspassengerochjl": {
+      "ads": [
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
+          "title": "1"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
+          "title": "2"
+        }
+      ]
+    },
    "shuttlepassengerochm2": {
      "ads": [
        {
@@ -226,7 +370,71 @@
        },
        {
          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
+          "title": "5"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
+          "title": "6"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg",
          "type": 0,
+          "cacheImgPath": "",
+          "title": "7"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "8"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "9"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png",
+          "title": "10"
+        }
+      ]
+    },
+    "buspassenger": {
+      "ads": [
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "1"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "2"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png",
+          "title": "3"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
+          "type": 0,
+          "cacheImgPath": "",
+          "title": "4"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v",
+          "type": 1,
          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg",
          "title": "5"
        },
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt
@@ -1,8 +1,10 @@
 package com.mogo.eagle.function.biz.v2x

+import android.util.*
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
+import com.mogo.eagle.core.utilcode.util.*
 import com.zhjt.service.chain.ChainLog

 class V2XBizTrace {
@@ -16,7 +18,7 @@ class V2XBizTrace {
            paramIndexes = [0, 1]
        )
        fun onAck(data: Any, data1: Any) {
-            CallerLogger.d("$M_V2X${data.toString()}", data1)
+            Log.d("V2X", "tag:$data, msg: $data1")
        }
    }
 }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt
@@ -218,8 +218,11 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
     */
    private fun openLoggerLevel() {
        Logger.init(LogLevel.DEBUG)
-        MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = true
-        MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowNetDebugLog = true
+        val config = MoGoAiCloudClient.getInstance().aiCloudClientConfig
+        if(config != null){
+            config.isShowDebugLog = true
+            config.isShowNetDebugLog = true
+        }
        CallerAutoPilotControlManager.setEnableLog(true)
    }

@@ -228,8 +231,11 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
     */
    private fun closeLoggerLevel() {
        Logger.init(if (DebugConfig.isDebug()) LogLevel.DEBUG else LogLevel.OFF)
-        MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = false
-        MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowNetDebugLog = false
+        val config = MoGoAiCloudClient.getInstance().aiCloudClientConfig
+        if(config != null){
+            config.isShowDebugLog = false
+            config.isShowNetDebugLog = false
+        }
        CallerAutoPilotControlManager.setEnableLog(false)
    }

--- 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
@@ -196,9 +196,9 @@ internal class SOPSettingView @JvmOverloads constructor(
                return@setOnCheckedChangeListener
            }
            hmiAction("SOP 雨天模式开关, ",isChecked)
+            FunctionBuildConfig.isRainMode = isChecked
            CallerAutoPilotControlManager.setRainMode(isChecked)
            CallerHmiViewControlListenerManager.invokeFuncMode(FUNC_MODE_RAIN, isChecked)
-            FunctionBuildConfig.isRainMode = isChecked
        }
        //雨天模式按钮只在司机屏生效，乘客屏不显示
        if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt
@@ -15,6 +15,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.R
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import kotlinx.android.synthetic.main.view_status_bar.view.*
@@ -54,8 +55,10 @@ class StatusBarView @JvmOverloads constructor(
        //将状态窗口中的状态移到状态栏上
        CallerDevaToolsManager.showStatusBar(context, status_container)

-        updateStatusBarLeftView(true, FUNC_MODE_DEMO, DemoModeView(this.context))
-        updateStatusBarLeftView(true, FUNC_MODE_RAIN, RainModeView(this.context))
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+            updateStatusBarLeftView(true, FUNC_MODE_DEMO, DemoModeView(this.context))
+            updateStatusBarLeftView(true, FUNC_MODE_RAIN, RainModeView(this.context))
+        }
    }

    override fun onSkinModeChange(skinMode: Int) {
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml
@@ -32,7 +32,7 @@
        android:textStyle="bold"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintLeft_toRightOf="@id/hmi_traffic_light_iv"
-        android:layout_marginStart="-30dp"
+        android:layout_marginStart="-40dp"
        />

    <TextView
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
@@ -130,9 +130,6 @@ class OverMapView @JvmOverloads constructor(
    @Volatile
    private var lastTime = 0L

-    @Volatile
-    private var isPointsChanged = false
-
    /**
     * 高频的
     */
@@ -808,10 +805,7 @@ class OverMapView @JvmOverloads constructor(
        if (mCoveredPolyline != null) {
            mCoveredPolyline!!.options.customTextureList = textureList
            mCoveredPolyline!!.options.customTextureIndex = texIndexList
-            if (isPointsChanged) {
-                mCoveredPolyline!!.points = coordinates
-                isPointsChanged = false
-            }
+            mCoveredPolyline!!.points = coordinates
            return
        }

@@ -1090,7 +1084,6 @@ class OverMapView @JvmOverloads constructor(
            lastTime = System.currentTimeMillis()
        }
        MarkerDrawerManager.stopLoopCalCarLocation()
-        isPointsChanged = true
        globalPathResp?.let {
            ThreadUtils.getSinglePool().execute {
                handlePlanningData(it.wayPointsList)
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
@@ -116,8 +116,8 @@ object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusLis
    }

    fun updateAutoPilotStatus(autopilotState: Int, autopilotMode: Int) {
-        this.autopilotState = autopilotState
        mAutopilotStatusInfo.state = autopilotState
+        this.autopilotState = autopilotState
        mAutopilotStatusInfo.pilotmode = autopilotMode
        invokeAutoPilotStatus()
    }