From 3861ff1838ce3f28b43a1fd77f51d426eaec141e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 20 Nov 2024 10:36:03 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fea]=20[=E8=A7=86=E9=A2=91view]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/common/module/manager/transform/OchTransform.kt | 7 +++++++ .../module/manager/transform/OchTransformDispatch.kt | 3 +++ .../java/com/mogo/och/weaknet/ShuttleDriverProvider.kt | 2 ++ .../datacenter/autopilot/telematic/TeleMsgHandler.kt | 3 +++ 4 files changed, 15 insertions(+) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransform.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransform.kt index 47d21521cb..cb0c48af35 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransform.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransform.kt @@ -1,5 +1,6 @@ package com.mogo.och.common.module.manager.transform +import android.view.View import com.mogo.eagle.core.function.api.och.IOchBizFunctionCall4Eagle import com.mogo.eagle.core.function.call.base.CallerBase import com.mogo.eagle.core.function.call.och.CallerOchBizFunctionCall4EagleManager @@ -15,4 +16,10 @@ object OchTransform : CallerBase(), IOchBizFunctionCall4Ea it.value.logout() } } + + override fun setVideoView(target: View?) { + M_LISTENERS.forEach { + it.value.setVideoView(target) + } + } } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransformDispatch.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransformDispatch.kt index 801a9f3ffd..978d89bfa0 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransformDispatch.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransformDispatch.kt @@ -1,6 +1,9 @@ package com.mogo.och.common.module.manager.transform +import android.view.View + interface OchTransformDispatch { fun logout(){} + fun setVideoView(target: View?){} } \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt index c3cc6e99b2..7469c5c8b9 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt @@ -19,6 +19,7 @@ import com.mogo.och.weaknet.repository.db.repository.TaskSiteDb import com.mogo.och.weaknet.ui.fragment.ShuttleFragment import com.mogo.och.weaknet.model.LineModel import com.mogo.och.weaknet.repository.RepositoryManager +import com.mogo.och.weaknet.repository.db.repository.WriteOffDb import com.mogo.och.weaknet.ui.bizswitch.SwitchBizView import com.mogo.och.weaknet.ui.qr.QrOpenView import com.mogo.och.weaknet.util.BusAnalyticsManager @@ -41,6 +42,7 @@ class ShuttleDriverProvider : CommonServiceImpl() { TaskDb.deleteObsoleteData() TaskSiteDb.deleteObsoleteData() EventDb.deleteObsoleteData() + WriteOffDb.deleteObsoleteData() } } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt index 4be8d66433..d4a3c8f395 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt @@ -24,6 +24,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerV2nNioEventListenerMana import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager +import com.mogo.eagle.core.function.call.och.CallerOchBizFunctionCall4EagleManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager @@ -178,6 +179,7 @@ class TeleMsgHandler : IMsgHandler { // 10: 第1个1代表运营面板开关打开，第2个0代表打开成功，告之司机端 CallerTelematicManager.sendMsgToServer(TelematicConstant.DRIVE_SEAT_VIDEO_STREAM_RSP, "11".toByteArray()) } + CallerOchBizFunctionCall4EagleManager.setVideoView(target) } else { CallerTelematicManager.sendMsgToServer(TelematicConstant.DRIVE_SEAT_VIDEO_STREAM_RSP, "10".toByteArray()) @@ -185,6 +187,7 @@ class TeleMsgHandler : IMsgHandler { } else { //第1个0代表运营面板开关关闭，第2个1代表关闭成功，告之司机端; 相应的还有状态：00表示关闭失败 CallerTelematicManager.sendMsgToServer(TelematicConstant.DRIVE_SEAT_VIDEO_STREAM_RSP, "01".toByteArray()) + CallerOchBizFunctionCall4EagleManager.setVideoView(null) } } catch (t: Throwable) { t.printStackTrace()