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

 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/BaseActivity.java
	collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataCameraHandler.kt
This commit is contained in:
squallzhjch
2023-03-22 10:28:07 +08:00
34 changed files with 8 additions and 2848 deletions

View File

@@ -70,10 +70,10 @@ dependencies {
implementation "org.mapsforge:vtm:$vtmVersion"
implementation "org.mapsforge:vtm-themes:$vtmVersion"
implementation "org.mapsforge:vtm-android:$vtmVersion"
implementation "org.mapsforge:vtm-android:$vtmVersion:natives-armeabi-v7a"
implementation "org.mapsforge:vtm-android:$vtmVersion:natives-arm64-v8a"
implementation "org.mapsforge:vtm-android:$vtmVersion:natives-x86"
implementation "org.mapsforge:vtm-android:$vtmVersion:natives-x86_64"
runtimeOnly "org.mapsforge:vtm-android:$vtmVersion:natives-armeabi-v7a"
runtimeOnly "org.mapsforge:vtm-android:$vtmVersion:natives-arm64-v8a"
runtimeOnly "org.mapsforge:vtm-android:$vtmVersion:natives-x86"
runtimeOnly "org.mapsforge:vtm-android:$vtmVersion:natives-x86_64"
implementation "org.mapsforge:vtm-http:$vtmVersion"
implementation "org.mapsforge:vtm-json:$vtmVersion"
@@ -81,10 +81,10 @@ dependencies {
implementation "org.mapsforge:vtm-android-mvt:$vtmVersion"
implementation "org.mapsforge:vtm-mvt:$vtmVersion"
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-armeabi-v7a"
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-arm64-v8a"
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-x86"
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-x86_64"
runtimeOnly "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-armeabi-v7a"
runtimeOnly "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-arm64-v8a"
runtimeOnly "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-x86"
runtimeOnly "org.mapsforge:vtm-android-gdx:$vtmVersion:natives-x86_64"
implementation "org.mapsforge:vtm-android-gdx:$vtmVersion"
implementation "com.google.protobuf:protobuf-java:3.6.1"