yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.5.0] fix bug of marker

Browse Source
This commit is contained in:
EmArrow
2024-07-24 19:18:16 +08:00
parent afdfa3750d
commit 93eef36bd9
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt
View File

@@ -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())

3
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt
View File

@@ -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

7
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt
View File

@@ -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)

1
core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml
View File

@@ -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"