[6.1.0]

[charter]
[靠边停车通知变更、开关车门放弃6s超时]

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt

@@ -166,10 +166,17 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
         errorInfo: String?
     ) {
         when (actionStatus) {
+            StopSideStatusManager.Status.NOSTART -> {
+                DriverM1Model.get().pushOperationalToMsgBox(
+                    DateTimeUtil.getCurrentTimeStamp(),
+                    "靠边停车无响应，注意随时接管",
+                    OPERATION_ROAD_SIDE_TYPE
+                )
+            }
             StopSideStatusManager.Status.START -> { // 靠边停车 to 消息盒子
                 DriverM1Model.get().pushOperationalToMsgBox(
                     DateTimeUtil.getCurrentTimeStamp(),
-                    "靠边停车",
+                    "开始靠边停车",
                     OPERATION_ROAD_SIDE_TYPE
                 )
             }
@@ -177,7 +184,7 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
                     StopSideStatusManager.Status.NOSTART-> {
                 DriverM1Model.get().pushOperationalToMsgBox(
                     DateTimeUtil.getCurrentTimeStamp(),
-                    "靠边停车失败",
+                    "靠边停车失败，注意随时接管",
                     OPERATION_ROAD_SIDE_TYPE
                 )
             }

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt

@@ -187,6 +187,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
             }
 
             else -> {
+                EventBus.getDefault().post(EventLineSites(null, null, true))
                 viewCallback?.setVisableByTrun(showNorOrder = true)
             }
         }

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt

@@ -18,7 +18,6 @@ object LightAirconditionDoorManager {
     private const val TAG = "LightAirconditionDoorManager"
 
     private var dooorSubscribe: Disposable? = null
-    private var doorStatusSubscribe: Disposable? = null
 
     fun go2OpenDoor(go2Open:Boolean){
         val canOpenOrCloseDoor = canOpenOrCloseDoor()
@@ -41,46 +40,6 @@ object LightAirconditionDoorManager {
             }
             CallerAutoPilotControlManager.sendRoboBusJinlvM1FrontDoorCmd(2)
         }
-        RxUtils.disposeSubscribe(doorStatusSubscribe)
-        doorStatusSubscribe = RxUtils.createSubscribe(6000) {
-            if (LightAirconditionDoorStatusManager.doorStatus.isOpen) {
-                if(!go2Open) {// 关门失败
-                    ToastCharterUtils.showToastShort("车辆系统繁忙，稍后再试试吧～")
-                    VoiceNotice.showNotice(
-                        "车辆系统繁忙，稍后再试试吧～",
-                        AIAssist.LEVEL0
-                    )
-                    sendMsg2Server("车门关闭失败")
-                }
-            }else{
-                if(go2Open) {//开门失败
-                    ToastCharterUtils.showToastShort("车辆系统繁忙，稍后再试试吧～")
-                    VoiceNotice.showNotice(
-                        "车辆系统繁忙，稍后再试试吧～",
-                        AIAssist.LEVEL0
-                    )
-                    sendMsg2Server("车门开启失败")
-                }
-            }
-        }
-    }
-
-    private fun sendMsg2Server(msg: String) {
-        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
-            OCHSocketMessageManager.pushAppOperationalMsgBox(
-                DateTimeUtil.getCurrentTimeStamp(),
-                msg,
-                3
-            )
-        } else if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
-            val appConnectMsg = AppConnectMsg(
-                isViewShow = true,
-                isPlay = false,
-                msg = msg,
-                boxType = 3
-            )
-            LanSocketManager.sendMsgToServer(appConnectMsg)
-        }
     }
 
     private fun canOpenOrCloseDoor(): String? {