From 1f7da9bd2936a6fb3ba9752629b7031581a1c42d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 10 Feb 2023 17:28:41 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Frobotaxi-d-app-module=5F2132=5F221223=5F?= =?UTF-8?q?2.13.2]=20=E5=8E=BB=E6=8E=89=E6=96=AD=E5=BC=80=E8=80=81obu?= =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/setting/SOPSettingView.kt | 11 ++++++----- .../function/obu/mogo/MogoPrivateObuNewManager.kt | 7 ------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index 6865374f1c..87f08bde14 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -188,11 +188,12 @@ class SOPSettingView @JvmOverloads constructor( tbObu.isChecked = CallerOBUManager.isConnected() tbObu.setOnCheckedChangeListener { _, isChecked -> if (!isChecked) { - if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { - CallerOBUManager.resetObuIpAddress("192.168.1.199") - } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { - CallerOBUManager.resetObuIpAddress("192.168.8.199") - } + CallerOBUManager.resetObuIpAddress("192.168.1.199") +// if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { +// CallerOBUManager.resetObuIpAddress("192.168.1.199") +// } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { +// CallerOBUManager.resetObuIpAddress("192.168.8.199") +// } } else { //断开链接 CallerOBUManager.disConnectObu() diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt index e22a0d3f7e..7bf199d550 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt @@ -106,13 +106,6 @@ class MogoPrivateObuNewManager private constructor() { mObuStatusInfo.obuStatus = true CallerObuListenerManager.invokeListener(mObuStatusInfo) mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU", true) } - - //断开老obu - try { - com.zhidao.support.obu.MogoObuManager.getInstance().disConnect() - } catch (e: Exception) { - e.printStackTrace() - } } }