squallzhjch 46fa06d1a8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS ...

 Conflicts:

	app/src/main/AndroidManifest.xml

	app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt

	app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt

2023-06-14 13:51:43 +08:00

..

src

Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

2023-06-14 13:51:43 +08:00

.gitignore

fix: 增加忽略规则

2023-05-06 18:42:52 +08:00

build.gradle

merge code

2023-06-09 19:10:55 +08:00

proguard-rules.pro

创建工程

2023-03-21 16:57:28 +08:00