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

[6.7.0][UI走查] 修复乘客屏遗留部分UI问题

Browse Source
This commit is contained in:
renwj
2024-10-17 19:38:51 +08:00
parent 3ba92ea9d6
commit 0a1104e48f
9 changed files with 66 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt
View File

@@ -58,7 +58,6 @@ class V2NTest {
if (millis > 0) {
delay(millis)
}
// FunctionBuildConfig.v2nNewLinked = true
FunctionBuildConfig.v2nTotalSwitch = true
runCatching {
val map = HashMap<String, Boolean>().also {

1
build.gradle
View File

@@ -6,7 +6,6 @@ buildscript {
apply from: rootProject.file('gradle/ext.gradle')
repositories {
mavenLocal()
maven { url 'https://nexus.zhidaoauto.com/repository/maven-snapshot/' }
maven { url 'https://nexus.zhidaoauto.com/repository/maven-releases/' }
maven { url 'https://nexus.zhidaoauto.com/repository/maven-public/' }
maven { url 'https://storage.zego.im/maven' }

2
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
View File

@@ -114,7 +114,7 @@ class AiRoadMarker {
.longitude(marker.poi_lon)
.latitude(marker.poi_lat)
if (marker.poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_PEOPLE_CROSS.poiType) {
builder.anchorColor("#FFBF10")
builder.anchorColor("#FFBF10CC")
}
CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(builder.build())?.let { p ->
if (!markerIds.contains(markerId)) {

16
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HdMapBuildConfig.kt
View File

@@ -1,6 +1,8 @@
package com.mogo.eagle.core.data.config
import com.mogo.eagle.core.data.R
import com.mogo.eagle.core.data.enums.Carmodel
import kotlin.properties.Delegates
/**
* @author xiaoyuzhou
@@ -12,9 +14,9 @@ object HdMapBuildConfig {
* 自车模型(默认是出租车)
* 可以指定，R.raw.chuzuche，R.raw.xiaobache，R.raw.hongqi
*/
@Volatile
@JvmField
var currentCarVrIconRes = R.raw.hq_h9
var currentCarVrIconRes by Delegates.observable(R.raw.hq_h9) { _, _, newValue ->
carModel = Carmodel.values().find { it.resId == newValue }
}
/**
* 地图 DEFAULT 是否加载成功
@@ -24,4 +26,12 @@ object HdMapBuildConfig {
@JvmField
var isMapLoaded = false
/**
* 表示当前车机数据实体
*/
@Volatile
@JvmField
var carModel: Carmodel? = null
}

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
View File

@@ -830,7 +830,7 @@ enum class EventTypeEnumNew(
}
}
TYPE_SOCKET_ROAD_CONGESTION.poiType -> R.raw.v2x_yongdu
TYPE_SOCKET_ROAD_PEOPLE_CROSS.poiType -> if (FunctionBuildConfig.skinMode != 0) TrafficTypeEnum.TYPE_TRAFFIC_ID_PEOPLE.traffic3DIconId else TrafficTypeEnum.TYPE_TRAFFIC_ID_PEOPLE.traffic3DNightIconId
TYPE_SOCKET_ROAD_PEOPLE_CROSS.poiType -> if (FunctionBuildConfig.skinMode != 0) TrafficTypeEnum.TYPE_TRAFFIC_ID_PEOPLE_CROSS.traffic3DIconId else TrafficTypeEnum.TYPE_TRAFFIC_ID_PEOPLE_CROSS.traffic3DNightIconId
TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> if (FunctionBuildConfig.skinMode != 0) TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE_RETROGRADE.traffic3DIconId else TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE_RETROGRADE.traffic3DNightIconId
else -> 0
}

8
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt
View File

@@ -129,6 +129,14 @@ enum class TrafficTypeEnum(
R.raw.traffic_tachexiaoche_retrograde,
R.raw.traffic_tachexiaoche_retrograde,
R.raw.traffic_tachexiaoche_retrograde
),
TYPE_TRAFFIC_ID_PEOPLE_CROSS(
100064,
"行人横穿",
R.raw.xingren,
R.raw.xingren,
R.raw.xingren
);

2
gradle.properties
View File

@@ -81,7 +81,7 @@ MOGO_LOCATION_VERSION=1.4.7.42
MOGO_TELEMATIC_VERSION=1.4.7.42
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=3.4.1.13_alpha_7
MAP_SDK_VERSION=3.4.1.13_alpha_8
MAP_SDK_DATA_VERSION=1.0.0.9
MAP_SDK_OPERATION_VERSION=1.1.4.1
# websocket

40
libraries/mogo-map/src/main/java/com/mogo/map/MogoAutoView.kt Normal file
View File

@@ -0,0 +1,40 @@
package com.mogo.map
import android.content.Context
import android.util.AttributeSet
import com.mogo.eagle.core.data.config.HdMapBuildConfig
import com.mogo.eagle.core.data.enums.Carmodel.T2
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import com.zhidaoauto.map.sdk.inner.abs.IMapController
import com.zhidaoauto.map.sdk.inner.abs.IMarkerController
import com.zhidaoauto.map.sdk.open.abs.view.IMapStyleParams
import com.zhidaoauto.map.sdk.open.renders.marker.Marker
import com.zhidaoauto.map.sdk.open.renders.marker.MarkerOptions
import com.zhidaoauto.map.sdk.open.view.MapAutoView
class MoGoAutoView: MapAutoView {
companion object {
private const val TAG = "MoGoAutoView"
}
constructor(context: Context) : super(context)
constructor(context: Context, mapStyleParams: IMapStyleParams) : super(context, mapStyleParams)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
override fun getMarkerController(mapController: IMapController): IMarkerController {
return MarkerControllerWrapper(super.getMarkerController(mapController))
}
private class MarkerControllerWrapper(private val controller: IMarkerController): IMarkerController by controller {
override fun addSelfCar(markerOptions: MarkerOptions): Marker? {
Logger.d(TAG, "addSelfCar-> ${HdMapBuildConfig.carModel}")
if (HdMapBuildConfig.carModel == T2) {
markerOptions.scale = 1.05f
}
return controller.addSelfCar(markerOptions)
}
}
}

4
libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.kt
View File

@@ -31,9 +31,9 @@ open class MogoMapView : MogoBaseMapView, ILifeCycle {
override fun addMapView(context: Context, attrs: AttributeSet) {
if (mapAutoView == null) {
mapAutoView = if (styleParams == null) {
MapAutoView(context, attrs)
MoGoAutoView(context, attrs)
} else {
MapAutoView(context, styleParams!!)
MoGoAutoView(context, styleParams!!)
}
}
if (mMapView == null) {