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

Browse Source

 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

...

This commit is contained in:

qiji4215

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

parent 3876ab9f38 12223e7a1e

commit 4f9f85d09d

90 changed files with 2972 additions and 812 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

collect-library/libs/arm64-v8a/libindoor.so Normal file

Binary file not shown.

BIN

collect-library/libs/arm64-v8a/liblocSDK8b.so Normal file

Binary file not shown.

BIN

collect-library/libs/x86/liblocSDK8b.so Normal file

Binary file not shown.

BIN

collect-library/libs/x86_64/liblocSDK8b.so Normal file

Binary file not shown.