From 27d0f6d25589d60c430143931d47ef742be9b85c Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 24 May 2023 10:37:34 +0800
Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[=E8=BD=A6=E9=97=A8?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E5=A4=B1=E8=B4=A5=E9=80=9A=E7=9F=A5=E5=8F=B8?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/module/manager/LanSocketManager.kt | 29 +++++++++++++++++++
 .../LightAirconditionDoorManager.kt           | 17 +++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/LanSocketManager.kt

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/LanSocketManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/LanSocketManager.kt
new file mode 100644
index 0000000000..4e07bf5b0f
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/LanSocketManager.kt
@@ -0,0 +1,29 @@
+package com.mogo.och.common.module.manager
+
+import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
+import com.mogo.och.common.module.biz.constant.OchCommonConst
+
+object LanSocketManager {
+    private const val TAG = "LanSocket"
+    fun sendMsgToClient(msg: BaseDPMsg?) {
+        CallerLogger.d(SceneConstant.M_CHARTER_D + TAG, "sendMsgToClient" + GsonUtils.toJson(msg))
+        CallerTelematicManager.sendMsgToAllClients(
+            OchCommonConst.BUSINESS_STRING,
+            GsonUtils.toJson(msg).toByteArray()
+        )
+    }
+
+    fun sendMsgToServer(msg: BaseDPMsg?) {
+        CallerLogger.d(SceneConstant.M_CHARTER_D + TAG, "sendMsgToServer" + GsonUtils.toJson(msg))
+        CallerTelematicManager.sendMsgToServer(
+            OchCommonConst.BUSINESS_STRING,
+            GsonUtils.toJson(msg).toByteArray()
+        )
+    }
+
+
+}
\ No newline at end of file
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 e59a523149..7d226a5f95 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
@@ -4,6 +4,8 @@ import com.mogo.commons.voice.AIAssist
 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.och.common.module.bean.dpmsg.AppConnectMsg
+import com.mogo.och.common.module.manager.LanSocketManager
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.voice.VoiceNotice
 import io.reactivex.disposables.Disposable
@@ -32,25 +34,36 @@ object LightAirconditionDoorManager {
         RxUtils.disposeSubscribe(doorStatusSubscribe)
         doorStatusSubscribe = RxUtils.createSubscribe(6000) {
             if (LightAirconditionDoorStatusManager.doorStatus.isOpen) {
-                if(!go2Open) {
+                if(!go2Open) {// 关门失败
                     ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～")
                     VoiceNotice.showNotice(
                         "车辆系统繁忙，稍后再试试吧～",
                         AIAssist.LEVEL0
                     )
+                    sendMsg2Server("车门关闭失败")
                 }
             }else{
-                if(go2Open) {
+                if(go2Open) {//开门失败
                     ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～")
                     VoiceNotice.showNotice(
                         "车辆系统繁忙，稍后再试试吧～",
                         AIAssist.LEVEL0
                     )
+                    sendMsg2Server("车门开启失败")
                 }
             }
         }
     }
 
+    private fun sendMsg2Server(msg:String){
+        val appConnectMsg = AppConnectMsg(
+            isViewShow = true,
+            isPlay = false,
+            msg = msg
+        )
+        LanSocketManager.sendMsgToServer(appConnectMsg)
+    }
+
     private fun canOpenOrCloseDoor(): String? {
         val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
         return if(location.gnssSpeed<0.01){