donghongyu-pc 473d9bb991 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local ...

# Conflicts:
#	OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
#	OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt
#	OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java
#	OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt

2024-10-30 10:08:40 +08:00

..

java/com/mogo/map

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

2024-10-30 10:08:40 +08:00

res

1. 替换自车图表（有指向）

2020-09-25 17:18:30 +08:00

AndroidManifest.xml

设置音量和播报模式

2020-01-14 11:45:12 +08:00