Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

# Conflicts:
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
This commit is contained in:
donghongyu-pc
2024-10-25 10:15:33 +08:00
20 changed files with 127 additions and 57 deletions

View File

@@ -55,7 +55,7 @@ class V2XAiRoadEventMarker {
.set3DMode(true)
.isUseGps(true)
.icon3DRes(R.raw.taxi_sanjiaozui)
.scale(1.0f)
.scale(0.5f)
.build().let {
CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(it)
}?.also {