Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robotaxi-d_241210_6.9.0

This commit is contained in:
yangyakun
2024-12-24 17:29:44 +08:00
12 changed files with 262 additions and 155 deletions

View File

@@ -1861,6 +1861,9 @@ class TravelRealityView @JvmOverloads constructor(
clearSmallSites()
} else {
UiThreadHandler.post {
smallSiteMarkerList?.forEach {
it.destroy()
}
smallSiteMarkerList = mAMap?.addMarkers(markerOptionsList, false)
}
}

View File

@@ -593,7 +593,7 @@ enum class EventTypeEnumNew(
//核销异常
TYPE_ABNORMAL_VERIFICATION(
"ABNORMAL_VERIFICATION",
"验票失败",
"核销失败",
"%s",
R.drawable.icon_warning_take_over,
"%s",