yangyakun 082a9d35bd Merge branch 'dev_robotaxi-d_230711_3.4.0' into dev_20230708_unmanned_3.5.0 ...

# Conflicts:
#	OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png
#	OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arriving.png

2023-08-04 14:38:38 +08:00

..

libs

[taxi/bus base util]

2022-05-06 10:18:01 +08:00

src

Merge branch 'dev_robotaxi-d_230711_3.4.0' into dev_20230708_unmanned_3.5.0

2023-08-04 14:38:38 +08:00

.gitignore

[taxi/bus base util]

2022-05-06 10:18:01 +08:00

build.gradle

[Build] 修正某些库设置的compileSdkVersion过高，导致需要更高的JDK版本才能构建成功

2023-05-10 11:10:08 +08:00

consumer-rules.pro

[taxi/bus base util]

2022-05-06 10:18:01 +08:00

proguard-rules.pro

[taxi/bus base util]

2022-05-06 10:18:01 +08:00