From b6c2e94b7e0559d5f788dcfb9753b1aa55726b38 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 9 Oct 2023 16:20:16 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=20[charter]=20[=E9=9D=A0=E8=BE=B9?=
 =?UTF-8?q?=E5=81=9C=E8=BD=A6=E9=80=9A=E7=9F=A5=E5=8F=98=E6=9B=B4=E3=80=81?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E8=BD=A6=E9=97=A8=E6=94=BE=E5=BC=836s?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charter/presenter/DriverM1Presenter.kt    | 11 ++++-
 .../ui/selectline/SelectLineViewModel.kt      |  1 +
 .../LightAirconditionDoorManager.kt           | 41 -------------------
 3 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
index 54bd08a11d..428327680c 100644
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
+++ b/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
                 )
             }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt
index 4d819933c2..b211c7b3d3 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt
+++ b/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)
             }
         }
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt
index ae0f0e55aa..2fa555553a 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt
+++ b/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? {