From 702090b295b455f502654d69fb93ddca3d4d1d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 22 Oct 2021 19:11:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E8=BD=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=88=87=E6=8D=A2OBU=E4=B8=8E=E5=B7=A5?= =?UTF-8?q?=E6=8E=A7=E6=9C=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- README.md | 3 +++ .../java/com/mogo/launcher/MogoApplication.java | 1 + .../function/obu/mogo/MogoPrivateObuManager.kt | 14 +++++++++----- .../com/mogo/map/impl/custom/AMapViewWrapper.java | 2 +- .../datacenter/SnapshotLocationDataCenter.java | 2 +- .../module/service/marker/MapMarkerManager.java | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e230e91c6c..6460bb7a51 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,9 @@ adb logcat -v time > /tmp/padlog/0915obu.txt adb -s 192.168.1.37:5555 logcat -v time > /tmp/padlog/0915obu.txt adb -s 192.168.1.37:5555 logcat -v time | grep "com.mogo.launcher.f" +// 获取地图存储的自车轨迹，可以使用工具进行绘制 +adb pull /sdcard/Android/data/com.mogo.launcher.f/log/20211022 + // (新的HMI)使用命令行触发 V2X 预警场景 // 顶部弹窗场景，控制展示 adb shell am broadcast -a com.hmi.v2x.notification --ez v2xIsShow true --es tag "200011" --ei v2xType 20011 --es alertContent "测试外部传入数据" --es ttsContent "测试TTS" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 9fb9243a7a..a1fda7b44b 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -106,6 +106,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setNeedRequestFloatPermission(BuildConfig.IS_NEED_REQUEST_FLOAT_PERMISSION); DebugConfig.setObuType(SharedPrefsMgr.getInstance(this).getInt("OBU_TYPE", DebugConfig.OBU_TYPE_CIDI)); + // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER; } diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index 207654bb3e..e34e64687c 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -1,9 +1,9 @@ package com.mogo.eagle.core.function.obu.mogo import android.content.Context -import android.text.TextUtils -import android.util.Log import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.commons.FunctionBuildConfig +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.function.call.hmi.CallerHmiManager @@ -14,7 +14,6 @@ import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.mogo.module.common.drawer.TrafficMarkerDrawer import com.mogo.module.common.enums.EventTypeEnum import com.mogo.service.IMogoServiceApis -import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.map.IMogoMapService import com.mogo.utils.storage.SharedPrefsMgr import com.zhidao.support.obu.MogoObuManager @@ -176,8 +175,13 @@ class MogoPrivateObuManager private constructor() { } catch (e: Exception) { e.printStackTrace() } - mIMogoMapService?.mapUIController?.syncLocation2Map(data) - SnapshotLocationDataCenter.getInstance().syncAdasLocationInfo(data) + + // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU + if (2 == FunctionBuildConfig.gpsProvider) { + mIMogoMapService?.mapUIController?.syncLocation2Map(data) + SnapshotLocationDataCenter.getInstance().syncAdasLocationInfo(data) + } + } catch (e: Exception) { e.printStackTrace() } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 87f4bbf533..aaf42b384c 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -1052,7 +1052,7 @@ public class AMapViewWrapper implements IMogoMapView, long adasSatelliteTime = data.optLong("adasSatelliteTime"); int gpsProvider = data.optInt("gpsProvider", 1); - // 使用与渠道配置一样的gps提供者提供的数据 + // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU if (gpsProvider == FunctionBuildConfig.gpsProvider) { if (lon == -1) { return; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java index 10ca090421..778b17a59b 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java @@ -91,7 +91,7 @@ public class SnapshotLocationDataCenter { long systemTime = data.optLong("systemTime"); int gpsProvider = data.optInt("gpsProvider", 1); - // 使用与渠道配置一样的gps提供者提供的数据 + // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU if (gpsProvider == FunctionBuildConfig.gpsProvider) { //测试面板状态同步 AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 7d52f427ad..b70be40df3 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -181,7 +181,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, // msg.obj = resultList; // msg.what = MSG_ADAS; // msg.sendToTarget(); - // 使用与渠道配置一样的gps提供者提供的数据 修改fPadLenovo.gradle文件中的GPS_PROVIDER字段控制渲染来源 + // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU Logger.d(TAG, "result.addAdasRecognizedDataCallback == 3 ------> "); if (FunctionBuildConfig.gpsProvider != 2) { AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(resultList);