squallzhjch dc6d5424dc Merge branch 'master' of gitlab.navinfo.com:vivo/navinfovivo ...

 Conflicts:

	app/src/main/java/com/navinfo/volvo/MainActivity.kt

	app/src/main/res/menu/bottom_nav_menu.xml

	app/src/main/res/navigation/mobile_navigation.xml

2022-12-28 11:01:22 +08:00

..

src

Merge branch 'master' of gitlab.navinfo.com:vivo/navinfovivo

2022-12-28 11:01:22 +08:00

.gitignore

初次提交

2022-12-23 11:33:58 +08:00

build.gradle

fix: 合并冲突

2022-12-27 16:33:25 +08:00

proguard-rules.pro

初次提交

2022-12-23 11:33:58 +08:00