From bdaffe788bd4176444928cf6dcd91bef73ff9c76 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 25 Mar 2022 16:40:04 +0800 Subject: [PATCH] =?UTF-8?q?[Fix]=E5=8D=87=E7=BA=A7=E5=A4=9A=E5=B1=8F?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=E7=89=88=E6=9C=AC=E3=80=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BB=99=E6=8C=87=E5=AE=9Achannel=E5=90=8C=E6=AD=A5=E7=BE=8E?= =?UTF-8?q?=E5=8C=96=E6=A8=A1=E5=BC=8F=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_ipc_monitoring/build.gradle | 2 +- .../function/autopilot/MoGoAutopilotProvider.kt | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle index 9bb528f9a9..e688cb6413 100644 --- a/app_ipc_monitoring/build.gradle +++ b/app_ipc_monitoring/build.gradle @@ -58,5 +58,5 @@ dependencies { // api "com.zhidao.support.adas:high:1.2.1.2_bate21" implementation 'org.greenrobot:eventbus:3.2.0' implementation 'com.android.support:multidex:1.0.3' - implementation 'com.mogo.cloud:telematic:1.3.31' + implementation 'com.mogo.cloud:telematic:1.3.50' } diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 532a214d64..363922b59a 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -27,6 +27,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.telematic.MogoProtocolMsg import com.mogo.telematic.MogoProtocolMsg.NORMAL_DATA +import com.mogo.telematic.MogoProtocolMsg.SYNC_MODE_STATUS import com.mogo.telematic.NSDNettyManager import com.mogo.telematic.client.listener.NettyClientListener import com.mogo.telematic.client.status.ConnectState @@ -90,13 +91,9 @@ class MoGoAutopilotProvider : override fun onChannelConnect(channel: Channel?) { val socketAddress = channel?.remoteAddress().toString() CallerLogger.d("$M_ADAS_IMPL$TAG", "Client ip is:${socketAddress}") - synchronized(this@MoGoAutopilotProvider) { - NSDNettyManager.getInstance().selectChannel(channel) - var byteArray = if(FunctionBuildConfig.isDemoMode) byteArrayOf(1) else byteArrayOf(0) - NSDNettyManager.getInstance().sendMogoProtocolMsgToClient(MogoProtocolMsg(3, byteArray.size, byteArray) - ) { - CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态是否成功：${it.isSuccess}") - } + val byteArray = if(FunctionBuildConfig.isDemoMode) byteArrayOf(1) else byteArrayOf(0) + NSDNettyManager.getInstance().sendMsgToSpecifiedClient(MogoProtocolMsg(SYNC_MODE_STATUS, byteArray.size, byteArray), channel) { + CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态是否成功：${it.isSuccess}") } } @@ -328,7 +325,7 @@ class MoGoAutopilotProvider : var byteArray = if (isEnable) byteArrayOf(1) else byteArrayOf(0) if (NSDNettyManager.getInstance().isServerStart) { NSDNettyManager.getInstance() - .sendMsgToAllClients(MogoProtocolMsg(3, byteArray.size, byteArray)) + .sendMsgToAllClients(MogoProtocolMsg(SYNC_MODE_STATUS, byteArray.size, byteArray)) } else { CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态时司机端Server未启动！") }