From 3ca0fc2a212b38b9bf1f287d368e1bf8b4a8ba03 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 20 Sep 2023 15:41:34 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=20[charter]=20[=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=BC=80=E5=85=B3=E9=97=A8=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=A4=84=E7=90=86]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/charter/model/DriverM1Model.kt   | 11 +++++--
 .../LightAirconditionDoorManager.kt           | 29 +++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
index 1d801a261c..a3bb685c6d 100644
--- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -56,6 +56,8 @@ import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STAT
 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.autopilotmanager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager
+import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager
 import com.mogo.och.common.module.utils.*
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.data.bean.*
@@ -271,9 +273,12 @@ class DriverM1Model {
         object : IMogoOnMessageListener<OperateDoorMsg> {
             override fun onMsgReceived(obj: OperateDoorMsg) {
                 d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.message)
-
-                sendMsgToClient(DPOperateDoorMsg(true))
-
+                val doorStatus = LightAirconditionDoorStatusManager.doorStatus
+                if (doorStatus.isOpen) {
+                    LightAirconditionDoorManager.go2OpenDoor(false)
+                } else {
+                    LightAirconditionDoorManager.go2OpenDoor(true)
+                }
             }
 
             override fun target(): Class<OperateDoorMsg> {
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 4db99d75e8..b41e642f91 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
@@ -1,11 +1,14 @@
 package com.mogo.och.common.module.manager.devicemanage
 
 import com.mogo.commons.voice.AIAssist
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
-import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.och.common.module.bean.dpmsg.AppConnectMsg
+import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
 import com.mogo.och.common.module.manager.LanSocketManager
+import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
@@ -56,14 +59,22 @@ object LightAirconditionDoorManager {
         }
     }
 
-    private fun sendMsg2Server(msg:String){
-        val appConnectMsg = AppConnectMsg(
-            isViewShow = true,
-            isPlay = false,
-            msg = msg,
-            boxType = 3
-        )
-        LanSocketManager.sendMsgToServer(appConnectMsg)
+    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? {