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

..

libs

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

2023-04-19 15:52:28 +08:00

src

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

2023-04-19 15:52:28 +08:00

.gitignore

创建工程

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

build.gradle

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

2023-04-19 15:52:28 +08:00

consumer-rules.pro

创建工程

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

proguard-rules.pro

创建工程

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