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

.. wait to test of fun

Browse Source
This commit is contained in:
zhongchao
2022-10-20 15:02:46 +08:00
parent 8f876d4b0a
commit 6a0b659de7
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt
View File

@@ -21,6 +21,7 @@ import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_LIMIT
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_LTA
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_OPT_LINE
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_PNC_ACTIONS
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_PNC_WARNING
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RAIN_MODE
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RTS
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_SLW
@@ -90,6 +91,7 @@ class FuncConfigConst {
foundationSubList.add(SubBiz(BIZ_BYPASS, lock = false, state = true, dependNode = "", data = ""))
foundationSubList.add(SubBiz(BIZ_AUTOPILOT_LANE_SELECTION, lock = false, state = true, dependNode = "", data = ""))
foundationSubList.add(SubBiz(BIZ_PNC_ACTIONS, lock = false, state = true, dependNode = "", data = ""))
foundationSubList.add(SubBiz(BIZ_PNC_WARNING, lock = false, state = true, dependNode = "", data = ""))
businessList.add(Business(FOUNDATION,foundationSubList))
return FuncConfig(0, AppUtils.getAppVersionCode(), getChannelCode(), getEnv(), businessList)

7
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/TrackerSourceHelper.kt
View File

@@ -59,9 +59,10 @@ object TrackerSourceHelper {
}
// pnc预警
val pncColor = WarningHelper.getPncColor(data.uuid.toString())
if (pncColor.isNotBlank()) {
color = pncColor
WarningHelper.getPncColor(data.uuid.toString()){
if (it.isNotBlank()) {
color = it
}
}
return color
}

15
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/WarningHelper.kt
View File

@@ -3,10 +3,14 @@ package com.mogo.eagle.core.function.map.identify
import android.annotation.SuppressLint
import android.util.Log
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_PNC_WARNING
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.FOUNDATION
import com.mogo.eagle.core.data.traffic.TrafficData
import com.mogo.eagle.core.data.traffic.threatLevelColor
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getCurWgs84SatelliteTime
import com.zhjt.service_biz.BizConfig
import mogo.telematics.pad.MessagePad
import mogo.telematics.pad.MessagePad.PlanningObject
import java.util.concurrent.ConcurrentHashMap
@@ -111,30 +115,31 @@ object WarningHelper {
return ""
}
fun getPncColor(uuid: String): String {
@BizConfig(FOUNDATION,"",BIZ_PNC_WARNING)
fun getPncColor(uuid: String, color:(String) -> Unit) {
if (FunctionBuildConfig.isBeautyMode) {
// 判断物体是否有预警信息
if (pncWarningBeautyTrafficData.containsKey(uuid)) {
val planningTrack = pncWarningBeautyTrafficData[uuid]
if (planningTrack != null && !timeOut(planningTrack.time)) {
Log.i("EmArrow0926","pnc color uuid : $uuid")
return planningTrack.color
color.invoke(planningTrack.color)
} else {
pncWarningBeautyTrafficData.remove(uuid)
}
}
return ""
return color.invoke("")
} else {
// 判断物体是否有预警信息
if (pncWarningOriginTrafficData.containsKey(uuid)) {
val planningTrack = pncWarningOriginTrafficData[uuid]
if (planningTrack != null && !timeOut(planningTrack.time)) {
return planningTrack.color
color.invoke(planningTrack.color)
} else {
pncWarningOriginTrafficData.remove(uuid)
}
}
return ""
return color.invoke("")
}
}