Merge branch 'dev_minibus-p_230322_2.0.0' into 'dev_minibus-d_230322_3.0.0'

# Conflicts:
#   gradle.properties

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt

@@ -61,7 +61,7 @@ class BusPassengerFunctionDevicePresenter(view: M1DeviceFragment?) :
         }
         CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(1)
         disposeSubscribe(subscribeDoorStatus)
-        subscribeDoorStatus = createSubscribe {
+        subscribeDoorStatus = createSubscribe(6000) {
             if (!OCHM1LightAirconditionDoorStatusManager.doorStatus.isOpen) {
                 ToastUtils.showShort("车门无法开启，请使用车内物理按钮")
             }
@@ -80,7 +80,7 @@ class BusPassengerFunctionDevicePresenter(view: M1DeviceFragment?) :
         }
         CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(2)
         disposeSubscribe(subscribeDoorStatus)
-        subscribeDoorStatus = createSubscribe {
+        subscribeDoorStatus = createSubscribe(6000) {
             if (OCHM1LightAirconditionDoorStatusManager.doorStatus.isOpen) {
                 ToastUtils.showShort("车门无法关闭，请使用车内物理按钮")
             }

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt

@@ -10,44 +10,15 @@ import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager
 import com.mogo.och.common.module.voice.VoiceNotice
 
 class BusPassengerFunctionPresenter(view: M1ContainFragment?) :
-    BusBasePassengerFunctionDevicePresenter<M1ContainFragment?>(view),
-    OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback {
+    BusBasePassengerFunctionDevicePresenter<M1ContainFragment?>(view) {
     companion object{
         private const val TAG = "BusPassengerFunctionPresenter"
     }
     override fun onCreate(owner: LifecycleOwner) {
         super.onCreate(owner)
-        OCHPlanningStopSideStatusManager.addListener(TAG,this)
     }
 
     override fun onDestroy(owner: LifecycleOwner) {
         super.onDestroy(owner)
-        OCHPlanningStopSideStatusManager.removeListener(TAG)
-    }
-
-    override fun onStartAutopilotFailure(
-        actionStatus: OCHPlanningStopSideStatusManager.Status,
-        stopSideStatus: Boolean?,
-        errorInfo: String?
-    ) {
-        UiThreadHandler.post {
-            when (actionStatus) {
-                OCHPlanningStopSideStatusManager.Status.NOSTART -> {
-                    ToastUtils.showShort(errorInfo)
-                }
-                OCHPlanningStopSideStatusManager.Status.START -> {
-                    VoiceNotice.showNotice(context.getString(R.string.m1_stop_site_zh), AIAssist.LEVEL1)
-                }
-                OCHPlanningStopSideStatusManager.Status.DOING -> {
-                    // 正在靠边停车
-                }
-                OCHPlanningStopSideStatusManager.Status.EndingSuccess -> {
-                    ToastUtils.showShort("靠边停车成功")
-                }
-                OCHPlanningStopSideStatusManager.Status.EndingFaile -> {
-                    ToastUtils.showShort("靠边停车失败")
-                }
-            }
-        }
     }
 }

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt

@@ -2,6 +2,7 @@ package com.mogo.och.bus.passenger.presenter
 
 import androidx.lifecycle.LifecycleOwner
 import com.amap.api.maps.model.LatLng
+import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
@@ -27,16 +28,18 @@ 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.manager.OCHPlanningStopSideStatusManager
 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 com.mogo.och.common.module.voice.VoiceNotice
 import io.reactivex.disposables.Disposable
 import java.util.*
 
 class BusPassengerPresenter(view: MainFragment?) :
     BusBasePassengerFunctionDevicePresenter<MainFragment?>(view),
     IBusPassengerControllerStatusCallback, IDistanceTimeCallback, IOrderChangeCallback,
-    IOrderStatusChangeListener {
+    IOrderStatusChangeListener, OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback {
 
     private var subscribe: Disposable? = null
     private var gnssSpeed = 0.0f
@@ -49,6 +52,7 @@ class BusPassengerPresenter(view: MainFragment?) :
         CharterPassengerModel.setCarTypeChangeListener(this)
         CharterPassengerModel.setStatusChangeListener(TAG,this)
         CallerTelematicListenerManager.addListener(TAG, msgReceived)
+        OCHPlanningStopSideStatusManager.addListener(TAG,this)
         setCarChangeListener(R.raw.aiqinghao)
         //BusPassengerModel.setMoGoAutopilotPlanningListener(this)
 
@@ -60,6 +64,7 @@ class BusPassengerPresenter(view: MainFragment?) :
         CharterPassengerModel.setiDistanceTimeCallback(null)
         CharterPassengerModel.setCarTypeChangeListener(null)
         CallerTelematicListenerManager.removeListener(TAG)
+        OCHPlanningStopSideStatusManager.removeListener(TAG)
     }
     private fun setSpeed(speed:Float){
         UiThreadHandler.post {
@@ -260,4 +265,30 @@ class BusPassengerPresenter(view: MainFragment?) :
         mView?.drawEndStation(latLng)
     }
 
+    override fun onStartAutopilotFailure(
+        actionStatus: OCHPlanningStopSideStatusManager.Status,
+        stopSideStatus: Boolean?,
+        errorInfo: String?
+    ) {
+        UiThreadHandler.post {
+            when (actionStatus) {
+                OCHPlanningStopSideStatusManager.Status.NOSTART -> {
+                    ToastUtils.showShort(errorInfo)
+                }
+                OCHPlanningStopSideStatusManager.Status.START -> {
+                    VoiceNotice.showNotice(context.getString(R.string.m1_stop_site_zh), AIAssist.LEVEL1)
+                }
+                OCHPlanningStopSideStatusManager.Status.DOING -> {
+                    // 正在靠边停车
+                }
+                OCHPlanningStopSideStatusManager.Status.EndingSuccess -> {
+                    ToastUtils.showShort("靠边停车成功")
+                }
+                OCHPlanningStopSideStatusManager.Status.EndingFaile -> {
+                    ToastUtils.showShort("靠边停车失败")
+                }
+            }
+        }
+    }
+
 }

gradle.properties

@@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7
 applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
 # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0
-versionCode=3000000
-versionName=3.0.0
+versionCode=2000000
+versionName=2.0.0
 
 ################# 新架构模块Maven版本管理 #################
 MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10