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 70951e6ae6..25cd1cdca7 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 @@ -34,9 +34,7 @@ class MapBizProvider :IMoGoFunctionServerProvider, IMogoRoma { MogoTrajectoryOverlayManager.getInstance().init() MapPointCloudSubscriber.instance SpeedLimitDataManager.getInstance().start() - if(AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){ - RoadCrossCameraManager.instance.init(context) - } + RoadCrossCameraManager.instance.init(context) if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){ //todo 新增稳定设备类型需要添加,目的避免在nuc设备上使用此类功能 romaManager.init() aiCloudIdentifyDataManager.initServer(AbsMogoApplication.getApp()) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt index 3debcdd1fa..3bc2708508 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListene import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager import com.mogo.eagle.core.function.call.obu.CallerObuWarningListenerManager +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isT1T2 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isTaxi import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler import com.mogo.eagle.core.utilcode.util.ParseVersionUtils @@ -53,7 +54,7 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf if (dockerVersion != null && dockerVersion.isNotEmpty()) { try { val version = ParseVersionUtils.parseVersion(true, dockerVersion) - identify = if (version >= 30100 && isTaxi(FunctionBuildConfig.appIdentityMode)) { + identify = if (version >= 30100 && isT1T2(FunctionBuildConfig.appIdentityMode)) { FunctionBuildConfig.isBeautyMode = false drawType("关闭感知优化模式") DriverIdentify.originDataDrawer diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt index 1b11a4bb8b..392082f406 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.business.roadcross import android.annotation.SuppressLint import android.content.Context +import android.graphics.BitmapFactory import android.os.Handler import android.os.Looper import android.os.Message @@ -15,6 +16,7 @@ import com.mogo.eagle.core.function.business.roadcross.net.NDERoadCameraNetWorkM import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager +import com.mogo.eagle.core.function.map.R import com.mogo.eagle.core.function.view.CameraMarkerView import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -64,6 +66,9 @@ class RoadCrossCameraManager : IMoGoMapRoadListener { } private var distance: Double by Delegates.observable(0.0) { _, _, newV -> + if(!AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){ + return@observable + } if (!isCameraRequest && newV < 100) { isCameraRequest = true val roadCrossEnd = CallerMapRoadListenerManager.getCrossEndInfo() @@ -121,7 +126,7 @@ class RoadCrossCameraManager : IMoGoMapRoadListener { .flat(false) .isUseGps(true) .controlAngle(false) - .icon(CameraMarkerView(it)) + .icon(BitmapFactory.decodeResource(it.resources, R.drawable.road_camera)) .moveToCenter(false) .longitude(cameraDeviceInfo.lon) .latitude(cameraDeviceInfo.lat) diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml index 2e10ae5e3d..729f4b5d11 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml @@ -75,7 +75,6 @@ android:id="@+id/clScanningBg" android:layout_width="@dimen/dp_500" android:layout_height="@dimen/dp_300" - android:layout_marginStart="@dimen/dp_26" android:layout_marginTop="@dimen/dp_160" app:layout_constraintLeft_toLeftOf="@+id/mapRoamView" app:layout_constraintRight_toRightOf="@+id/mapRoamView"