From da1fdfb13a8175e60835aba738a6afb02bdf0739 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 28 Jun 2022 12:22:43 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20=E4=BF=AE=E5=A4=8D=E3=80=90RoboTaxi?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AB=AFV2.8.0=E3=80=91=E3=80=90=E5=81=B6?= =?UTF-8?q?=E7=8E=B0=E3=80=91=E8=BD=A6=E8=BE=86=E4=B8=8B=E7=94=B5=E9=87=8D?= =?UTF-8?q?=E5=90=AF=E5=90=8E=EF=BC=8C=E5=A4=9A=E6=AC=A1=E9=87=8D=E5=90=AF?= =?UTF-8?q?pad=EF=BC=8C=E6=97=A0=E5=AE=9A=E4=BD=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=84=9F=E7=9F=A5=EF=BC=8C=E6=97=A0=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=20http://jira.zhidaohulian.com/browse/YHJSYHZNWL-1044?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../autopilot/MoGoAutopilotProvider.kt | 37 ++++++++++--------- gradle.properties | 22 +++++------ 2 files changed, 30 insertions(+), 29 deletions(-) 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 16265007f3..c9f10bbd5b 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 @@ -132,25 +132,26 @@ class MoGoAutopilotProvider : .build() AdasManager.getInstance().create(options, MoGoAdasMsgConnectStatusListenerImpl()) NSDNettyManager.getInstance() - .searchAndConnectServer(context, MoGoAiCloudClientConfig.getInstance().sn, object : - NettyClientListener { - override fun onMessageResponseClient( - msg: MogoProtocolMsg?, - sign: String?, - channel: Channel - ) { - // 乘客端收到adas数据直接解析，后续分发解析后的数据流程同司机端 - msgHandler.handleMsgFromServer(msg, channel) - } + .searchAndConnectServer(context, MoGoAiCloudClientConfig.getInstance().sn, + AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode), + object : NettyClientListener { + override fun onMessageResponseClient( + msg: MogoProtocolMsg?, + sign: String?, + channel: Channel + ) { + // 乘客端收到adas数据直接解析，后续分发解析后的数据流程同司机端 + msgHandler.handleMsgFromServer(msg, channel) + } - override fun onClientStatusConnectChanged( - statusCode: Int, - sign: String?, - channel: Channel - ) { - msgHandler.handleClientConnStatus(statusCode, sign, channel) - } - }) + override fun onClientStatusConnectChanged( + statusCode: Int, + sign: String?, + channel: Channel + ) { + msgHandler.handleClientConnStatus(statusCode, sign, channel) + } + }) } //////////////////////////////////注意先后顺序，AdasManager.getInstance().create后才可以设置监听///////////////////////////////////////////// diff --git a/gradle.properties b/gradle.properties index f1c1d0b8df..e875b7dea9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,26 +63,26 @@ SERVICE_CHAIN_VERSION=1.1.0 LOGLIB_VERSION=1.3.2 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.3.6 +MOGO_NETWORK_VERSION=1.4.3.7 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.3.6 +MOGO_PASSPORT_VERSION=1.4.3.7 # 常链接 -MOGO_SOCKET_VERSION=1.4.3.6 +MOGO_SOCKET_VERSION=1.4.3.7 # 数据采集 -MOGO_REALTIME_VERSION=1.4.3.6 +MOGO_REALTIME_VERSION=1.4.3.7 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.4.3.6 +MOGO_TANLU_VERSION=1.4.3.7 # 直播推流 -MOGO_LIVE_VERSION=1.4.3.6 +MOGO_LIVE_VERSION=1.4.3.7 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.3.6 +MOGO_TRAFFICLIVE_VERSION=1.4.3.7 # 定位服务 -MOGO_LOCATION_VERSION=1.4.3.6 +MOGO_LOCATION_VERSION=1.4.3.7 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.3.6 +MOGO_TELEMATIC_VERSION=1.4.3.7 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.3.0.5 +MAP_SDK_VERSION=2.3.0.6 MAP_SDK_OPERATION_VERSION=1.0.13 # websocket WEBSOCKET_VERSION=1.1.7 @@ -155,7 +155,7 @@ MOGO_OCH_TAXI_VERSION=2.0.66 # mogoAiCloud sdk services MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10 # v2x-sdk -MOGO_V2X_SDK_VERSION=1.4.3.6 +MOGO_V2X_SDK_VERSION=1.4.3.7 ################# 旧版本架构模块版本 #################