From 661ad54a52d072c51c487c32fc35bbbc68d5ea43 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 17 Jan 2023 12:49:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[2.13.2]=E5=9B=9E=E9=80=80=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=BD=A6=E9=81=93=E4=B8=AD=E5=BF=83=E7=BA=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index 084d329bfe..6b0c2a8c40 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -343,7 +343,7 @@ public class AMapWrapper implements IMogoMap { @Override public CenterLine getCenterLineRangeInfo(double lon, double lat, float angle, float distance) { try { - com.zhidaoauto.map.sdk.open.road.CenterLine info = MapDataApi.INSTANCE.getCenterLineRoadNode(lon, lat, angle, distance); + com.zhidaoauto.map.sdk.open.road.CenterLine info = MapDataApi.INSTANCE.getCenterLineRangeInfo(lon, lat, angle, distance); CenterLine ret = null; if (info != null) { ret = new CenterLine(info.id, info.tile_id, info.road_id, info.lane_id, convert(info.points), info.angle == null ? 0f : info.angle); From 7f9ee5b430d9dc6041310b12dffaeb93e0b38015 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 17 Jan 2023 12:49:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[2.13.2]=E4=BF=AE=E6=AD=A3DebugSettingView?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/setting/DebugSettingView.kt | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index f93fff2e7a..8fe270ab24 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -16,6 +16,7 @@ import androidx.appcompat.widget.PopupMenu import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import androidx.core.view.* +import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import chassis.Chassis import chassis.VehicleStateOuterClass @@ -78,11 +79,13 @@ import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.* import com.mogo.eagle.core.function.business.routeoverlay.* import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager +import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner import com.zhidao.easysocket.utils.L import com.zhidao.support.adas.high.other.permission.BackgrounderPermission import com.zhjt.mogo_core_function_devatools.env.* import kotlinx.android.synthetic.main.view_debug_setting.view.* import kotlinx.android.synthetic.main.view_debug_setting.view.tbRouteDynamicEffect +import kotlinx.coroutines.launch import mogo.telematics.pad.MessagePad import mogo_msg.MogoReportMsg import java.text.SimpleDateFormat @@ -1874,18 +1877,20 @@ class DebugSettingView @JvmOverloads constructor( * OBU状态回调 */ override fun onObuStatusResponse(obuStatusInfo: ObuStatusInfo) { - tvObuInfo.text = GsonUtils.toJson(obuStatusInfo) + lifecycleOwner.lifecycleScope.launch { + tvObuInfo.text = GsonUtils.toJson(obuStatusInfo) - AppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion - AppConfigInfo.isConnectObu = obuStatusInfo.obuStatus + AppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion + AppConfigInfo.isConnectObu = obuStatusInfo.obuStatus - if (obuStatusInfo.obuStatus) { - obuConnectStatus = true - } - //OBU断开连接，提示异常 - if (obuConnectStatus && !obuStatusInfo.obuStatus) { - obuConnectStatus = false - toastMsg("OBU连接状态异常") + if (obuStatusInfo.obuStatus) { + obuConnectStatus = true + } + //OBU断开连接，提示异常 + if (obuConnectStatus && !obuStatusInfo.obuStatus) { + obuConnectStatus = false + toastMsg("OBU连接状态异常") + } } }