Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	core/mogo-core-function-call/build.gradle
This commit is contained in:
yangyakun
2023-02-24 18:51:07 +08:00
129 changed files with 3725 additions and 712 deletions

View File

@@ -46,9 +46,9 @@ object TrackerSourceColorHelper {
return ""
}
if (isV2I(data).second) {
color = "#00AEFFFF"
}
// if (isV2I(data).second) {
// color = "#00AEFFFF"
// }
//level : 2
if (isObu(data).second) {
@@ -62,14 +62,9 @@ object TrackerSourceColorHelper {
}
}
//融合结果 level : 1
if (isFusion(data)) {
color = "#9900ffFF"
}
//僵尸车
if(data.addAttribute == AdditionalAttribute.ATTR_ZOMBIE){
color = "#D1E5FDFF"
color = "#8F9AADFF"
}
// pnc预警