yangyakun 1607c60435 Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2 ...

# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
#	OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
#	OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
#	gradle.properties

2022-11-18 10:36:15 +08:00

..

src/main

Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2

2022-11-18 10:36:15 +08:00

.gitignore

增加了允公告相关，增加备注说明

2021-09-18 11:56:33 +08:00

build.gradle

rebade

2022-03-11 19:55:06 +08:00

consumer-rules.pro

增加了允公告相关，增加备注说明

2021-09-18 11:56:33 +08:00

gradle.properties

完成 Maven 发布

2021-10-29 20:51:15 +08:00

proguard-rules.pro

增加了允公告相关，增加备注说明

2021-09-18 11:56:33 +08:00