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

[6.2.6][Feat]新增Taxi所需模型

Browse Source
This commit is contained in:
chenfufeng
2023-12-21 15:36:00 +08:00
parent 119c50579a
commit 9ec8de199e
14 changed files with 94 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt
View File

@@ -1,10 +1,12 @@
package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road
import android.graphics.Color
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.enums.EventTypeEnumNew
import com.mogo.eagle.core.data.map.MogoLatLng
import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst
import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper
import com.mogo.map.overlay.core.*
@@ -23,6 +25,8 @@ class V2XAiRoadEventMarker {
.Builder(V2XConst.V2X_MARKER_OWNER, Level.MAP_MARKER)
.longitude(entity.location.lon)
.latitude(entity.location.lat)
.scale(if (EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.poiType == entity.poiType && AppIdentityModeUtils.isTaxi(
FunctionBuildConfig.appIdentityMode)) 0.6f else 1.0f)
.icon3DRes(EventTypeEnumNew.getMarker3DRes(entity.poiType))
.set3DMode(true)
.build())?.also { wrapper.addPoint(it) }

5
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java
View File

@@ -4,11 +4,14 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X
import static com.mogo.map.MogoMap.DEFAULT;
import androidx.core.util.Pair;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
import com.mogo.eagle.core.data.map.entity.MarkerExploreWay;
import com.mogo.eagle.core.data.map.entity.MarkerLocation;
import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.function.biz.v2x.V2XBizTrace;
import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst;
@@ -55,6 +58,8 @@ public class V2XRoadEventMarker implements IV2XMarker<V2XRoadEventEntity> {
.longitude(entity.getLocation().getLon())
.latitude(entity.getLocation().getLat())
.set3DMode(true)
.scale(EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.getPoiType().equals(entity.getPoiType()) && AppIdentityModeUtils.isTaxi(
FunctionBuildConfig.appIdentityMode) ? 0.6f : 1.0f)
.icon3DRes(EventTypeEnumNew.getMarker3DRes(entity.getPoiType())).build(),DEFAULT);
if (point != null) {
V2XBizTrace.Companion.onAck("V2XRoadEventMarker -> --- add Marker type: ", entity.getPoiType(), false);

2
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/drawer/TrafficMarkerDrawer.kt
View File

@@ -172,7 +172,7 @@ object TrafficMarkerDrawer {
TAG,
"drawObuRecognizedDataMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
)
val resId: Int = trafficData.type.traffic3DIconId
val resId: Int = TrafficTypeEnum.getMarker3DRes(trafficData.type.type)
val resIdVal = resId.toString() + ""
val builder = Point.Options.Builder(DataTypes.TYPE_MARKER_ADAS, MAP_MARKER)
.anchor(0.5f, 0.5f)

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

@@ -1,6 +1,8 @@
package com.mogo.eagle.core.data.enums
import com.mogo.eagle.core.data.R
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
/**
@@ -735,9 +737,15 @@ enum class EventTypeEnumNew(
FOURS_ICE.poiType -> R.raw.v2x_daolujiebing
FOURS_PONDING.poiType -> R.raw.v2x_daolujishui
GHOST_PROBE.poiType -> R.raw.v2x_guzhangqiuzhu
TYPE_SOCKET_ROAD_SHIGONG.poiType -> R.raw.v2x_shigong_warning
TYPE_SOCKET_ROAD_SHIGONG.poiType -> R.raw.v2x_shigong_warning// 施工气泡
TYPE_SOCKET_ROAD_JINGZHI.poiType -> R.raw.v2x_zhangai
TYPE_SOCKET_ROAD_SHIGU.poiType -> R.raw.v2x_shigu_sanjiaopai
TYPE_SOCKET_ROAD_SHIGU.poiType -> {
if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
R.raw.v2x_shigu_sanjiaopai
} else {
R.raw.taxi_sanjiaopai
}
}
TYPE_SOCKET_ROAD_CONGESTION.poiType -> R.raw.v2x_yongdu
else -> 0
}

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

@@ -1,6 +1,8 @@
package com.mogo.eagle.core.data.enums
import com.mogo.eagle.core.data.R
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
/**
@@ -118,6 +120,74 @@ enum class TrafficTypeEnum(
else -> TYPE_TRAFFIC_ID_WEI_ZHI
}
}
@JvmStatic
fun getMarker3DRes(type: Int): Int {
// Taxi和Bus使用不同的模型
if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
return when (type) {
TYPE_TRAFFIC_ID_WEI_ZHI.type -> R.raw.traffic_xiankuang
TYPE_TRAFFIC_ID_PEOPLE.type -> R.raw.taxi_traffic_people
TYPE_TRAFFIC_ID_BICYCLE.type -> R.raw.taxi_traffic_zixingche
TYPE_TRAFFIC_ID_TA_CHE.type -> R.raw.taxi_traffic_tachexiaoche
TYPE_TRAFFIC_ID_MOTO.type -> R.raw.taxi_traffic_motuoche
TYPE_TRAFFIC_ID_BUS.type -> R.raw.taxi_traffic_daba
TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.taxi_traffic_daba
TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG.type -> R.raw.v2x_shigong_warning
else -> R.raw.traffic_xiankuang
}
} else {
return when (type) {
TYPE_TRAFFIC_ID_WEI_ZHI.type -> R.raw.traffic_xiankuang
TYPE_TRAFFIC_ID_PEOPLE.type -> R.raw.xingren
TYPE_TRAFFIC_ID_BICYCLE.type -> R.raw.traffic_zixingche_day
TYPE_TRAFFIC_ID_TA_CHE.type -> R.raw.traffic_tachexiaoche_day
TYPE_TRAFFIC_ID_MOTO.type -> R.raw.traffic_motuoche_day
TYPE_TRAFFIC_ID_BUS.type -> R.raw.traffic_daba_day
TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.traffic_daba_day
TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG.type -> R.raw.v2x_shigong_warning
else -> R.raw.traffic_xiankuang
}
}
}
@JvmStatic
fun getMarkerNight3DRes(type: Int): Int {
// Taxi和Bus使用不同的模型
if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
return when (type) {
TYPE_TRAFFIC_ID_WEI_ZHI.type -> R.raw.traffic_xiankuang
TYPE_TRAFFIC_ID_PEOPLE.type -> R.raw.taxi_traffic_people
TYPE_TRAFFIC_ID_BICYCLE.type -> R.raw.taxi_traffic_zixingche
TYPE_TRAFFIC_ID_TA_CHE.type -> R.raw.taxi_traffic_tachexiaoche
TYPE_TRAFFIC_ID_MOTO.type -> R.raw.taxi_traffic_motuoche
TYPE_TRAFFIC_ID_BUS.type -> R.raw.taxi_traffic_daba
TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.taxi_traffic_daba
TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG.type -> R.raw.v2x_shigong_warning
else -> R.raw.traffic_xiankuang
}
} else {
return when (type) {
TYPE_TRAFFIC_ID_WEI_ZHI.type -> R.raw.traffic_xiankuang
TYPE_TRAFFIC_ID_PEOPLE.type -> R.raw.xingren_night
TYPE_TRAFFIC_ID_BICYCLE.type -> R.raw.traffic_zixingche
TYPE_TRAFFIC_ID_TA_CHE.type -> R.raw.traffic_tachexiaoche
TYPE_TRAFFIC_ID_MOTO.type -> R.raw.traffic_motuoche
TYPE_TRAFFIC_ID_BUS.type -> R.raw.traffic_daba
TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.traffic_daba
TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG.type -> R.raw.v2x_shigong_warning
else -> R.raw.traffic_xiankuang
}
}
}
}
}

BIN
core/mogo-core-res/src/main/res/raw/taxi_sanjiaopai.nt3d Normal file
View File

Binary file not shown.

BIN
core/mogo-core-res/src/main/res/raw/taxi_sanjiaozui.nt3d Normal file
View File

Binary file not shown.

BIN
core/mogo-core-res/src/main/res/raw/taxi_traffic_daba.nt3d Normal file
View File

Binary file not shown.

BIN
core/mogo-core-res/src/main/res/raw/taxi_traffic_motuoche.nt3d Normal file
View File

Binary file not shown.

BIN
core/mogo-core-res/src/main/res/raw/taxi_traffic_people.nt3d Normal file
View File

Binary file not shown.

BIN
core/mogo-core-res/src/main/res/raw/taxi_traffic_tachexiaoche.nt3d Normal file
View File

Binary file not shown.

BIN
core/mogo-core-res/src/main/res/raw/taxi_traffic_zixingche.nt3d Normal file
View File

Binary file not shown.

4
foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java
View File

@@ -5,10 +5,10 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig;
public class HostConst {
public static final String HOST_DEV = "https://eagle-qa.zhidaozhixing.com";
public static final String HOST_RELEASE = "http://eagle-mis.zhidaozhixing.com";
public static final String HOST_RELEASE = "https://eagle-mis.zhidaozhixing.com";
public static final String HOST_EAGLE_QA = "https://eagle-dns-qa.zhidaozhixing.com/";
public static final String HOST_EAGLE_RELEASE = "http://eagle-dns.zhidaozhixing.com/";
public static final String HOST_EAGLE_RELEASE = "https://eagle-dns.zhidaozhixing.com/";
public static String getHost() {
String host = HOST_RELEASE;

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

@@ -753,9 +753,9 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
private fun addPreVehicleModelWeiZhi(typeTrafficId: TrafficTypeEnum, logMsg: String) {
// 根据当前的地图皮肤模式动态替换
val preVehicleStrWeiZhi: String? = if (isDayMode) {
map.addPreVehicleModel(typeTrafficId.type, typeTrafficId.traffic3DIconId)
map.addPreVehicleModel(typeTrafficId.type, TrafficTypeEnum.getMarker3DRes(typeTrafficId.type))
} else {
map.addPreVehicleModel(typeTrafficId.type, typeTrafficId.traffic3DNightIconId)
map.addPreVehicleModel(typeTrafficId.type, TrafficTypeEnum.getMarkerNight3DRes(typeTrafficId.type))
}
d(M_MAP + TAG, logMsg + preVehicleStrWeiZhi)
if (preVehicleStrWeiZhi == null) {