qiji4215 4f9f85d09d Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS
 Conflicts:
	app/build.gradle
	app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
	app/src/main/java/com/navinfo/omqs/ui/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/res/layout/fragment_offline_map_state_list.xml
	app/src/main/res/layout/map_view.xml
	collect-library/build.gradle
2023-04-19 15:52:28 +08:00
..
2023-04-12 15:07:46 +08:00
2023-04-19 15:41:33 +08:00
2023-04-19 15:41:33 +08:00
2023-04-12 15:07:46 +08:00
2023-04-12 15:07:46 +08:00
2023-04-19 15:41:33 +08:00
2023-03-21 17:06:56 +08:00
2023-04-07 13:41:24 +08:00
2023-04-07 13:41:24 +08:00
2023-03-21 17:06:56 +08:00
2023-03-21 17:06:56 +08:00
2023-03-21 17:06:56 +08:00
2023-04-07 13:41:24 +08:00