From 3f34fb49f8975694707bba065949b7231d8de8cf Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 16 Jun 2023 16:27:05 +0800 Subject: [PATCH] [3.3.0] add limit of device model non of lenovo and eb5 to fit roma and pointCloud biz --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 10 ++++++++-- .../com/mogo/eagle/core/function/MapBizProvider.kt | 5 ++++- .../com/mogo/eagle/core/function/utils/MapBizTrace.kt | 2 +- .../eagle/core/utilcode/mogo/logger/scene/Scene.kt | 11 +---------- .../mogo/eagle/core/utilcode/util/DeviceUtils.java | 8 ++++++++ 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 5af551d843..43e4d750f7 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.datacenter.autopilot.adapter import bag_manager.BagManagerOuterClass import chassis.ChassisStatesOuterClass import chassis.VehicleStateOuterClass +import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HdMapBuildConfig @@ -52,6 +53,7 @@ import com.mogo.eagle.core.function.call.obu.CallerObuWarningRsmListenerManager import com.mogo.eagle.core.function.call.obu.CallerObuWarningSpatListenerManager import com.mogo.eagle.core.function.call.v2x.* import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.support.obu.ObuScene import com.zhidao.support.adas.high.OnAdasListener import com.zhjt.mogo.adas.data.bean.AdasParam @@ -321,9 +323,13 @@ class MoGoAdasListenerImpl : OnAdasListener { //他车轨迹预测 } + //todo 新增稳定设备类型需要添加，目的避免在nuc设备上使用此类功能 + private val limit = DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model() override fun onPointCloud(header: MessagePad.Header, pointCloud: ByteArray?) { - //点云数据透传 - CallerAutopilotPointCloudListenerManager.invokeAutopilotPointCloudDataUpdate(pointCloud) + if(limit){ + //点云数据透传 + CallerAutopilotPointCloudListenerManager.invokeAutopilotPointCloudDataUpdate(pointCloud) + } } //planning障碍物 diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt index da034e1971..81f3e770e0 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt @@ -12,6 +12,7 @@ import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Compa import com.mogo.eagle.core.function.business.identify.MapIdentifySubscriber import com.mogo.eagle.core.function.business.routeoverlay.MogoRouteOverlayManager import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager +import com.mogo.eagle.core.utilcode.util.DeviceUtils @Route(path = MogoServicePaths.PATH_MAP_BIZ) class MapBizProvider :IMoGoFunctionServerProvider, IMogoRoma { @@ -24,7 +25,9 @@ class MapBizProvider :IMoGoFunctionServerProvider, IMogoRoma { MogoRouteOverlayManager.getInstance().init() MapPointCloudSubscriber.instance SpeedLimitDataManager.getInstance().start() - aiCloudIdentifyDataManager.initServer(AbsMogoApplication.getApp()) + if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){ //todo 新增稳定设备类型需要添加，目的避免在nuc设备上使用此类功能 + aiCloudIdentifyDataManager.initServer(AbsMogoApplication.getApp()) + } // 视角切换功能初始化，监听路口及停止线回调 CallerVisualAngleManager.init() } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapBizTrace.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapBizTrace.kt index 8a9a5f7b15..060c44b0e8 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapBizTrace.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapBizTrace.kt @@ -21,7 +21,7 @@ class MapBizTrace { realLog(pN, cN, data, data1) } if (DebugConfig.isDebug()) { - CallerLogger.d("$M_MAP${data.toString()}", data1) + CallerLogger.d("$M_MAP$data", data1) } } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt index 798fe7f0d8..5589b9edb7 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt @@ -85,16 +85,7 @@ class Scene { } fun check(tag: String): Boolean { - return if (canLog()) { - classifyLog(tag) - } else { - false - } - } - - //前置收口 - private fun canLog(): Boolean { - return true + return classifyLog(tag) } /** diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java index c80b2deecb..3134cc5b38 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java @@ -314,6 +314,14 @@ public final class DeviceUtils { return Build.MANUFACTURER; } + public static Boolean isLenovoModel(){ + return getModel().contains("Lenovo"); + } + + public static Boolean isEB5Model(){ + return getModel().contains("R.5.LA"); + } + /** * Return the model of device. *

e.g. MI2SC