[6.1.0]

[charter]
[小程序开关门司机端处理]

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> {

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? {