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

 Conflicts:

	app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt

	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt

	collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java

	vtm

2023-11-21 17:40:52 +08:00

..

src

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

2023-11-21 17:40:52 +08:00

.gitignore

fix: 增加忽略规则

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

build.gradle

1.增加要素聚合显示数字业务2.调整部分渲染样式

2023-11-15 16:37:44 +08:00

proguard-rules.pro

创建工程

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