diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..5c54078a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vtm"] + path = vtm + url = git@github.com:mapsforge/vtm.git diff --git a/app/src/main/java/com/navinfo/omqs/rule/LeftPanel.kt b/app/src/main/java/com/navinfo/omqs/rule/LeftPanel.kt deleted file mode 100644 index e4214c05..00000000 --- a/app/src/main/java/com/navinfo/omqs/rule/LeftPanel.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.navinfo.omqs.rule - -class LeftPanel { - -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0a318d80..5900d1f1 100644 --- a/build.gradle +++ b/build.gradle @@ -8,9 +8,14 @@ buildscript { } } plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '7.4.2' apply false + id 'com.android.library' version '7.4.2' apply false id 'org.jetbrains.kotlin.android' version '1.8.0' apply false id 'com.google.dagger.hilt.android' version '2.44' apply false - } +static def androidCompileSdk() { return 33 } +allprojects { + ext.gdxVersion = "1.11.0" + ext.gwtVersion = "2.8.2" + ext.slf4jVersion = "1.7.28" +} \ No newline at end of file diff --git a/collect-library/build.gradle b/collect-library/build.gradle index 85910984..eb29aaa7 100644 --- a/collect-library/build.gradle +++ b/collect-library/build.gradle @@ -45,6 +45,12 @@ android { sourceSets { main { jniLibs.srcDirs = ['libs'] + file("../vtm/vtm-android/natives").eachDir() { dir -> + jniLibs.srcDirs += "${dir.path}/lib" + } + file("../vtm/vtm-android-gdx/natives").eachDir() { dir -> + jniLibs.srcDirs += "${dir.path}/lib" + } } } } @@ -72,25 +78,34 @@ dependencies { // VTM依赖 implementation "net.sf.kxml:kxml2:2.3.0" implementation 'org.slf4j:slf4j-api:2.0.7' - api "org.mapsforge:vtm:$vtmVersion" - implementation "org.mapsforge:vtm-themes:$vtmVersion" - implementation "org.mapsforge:vtm-android:$vtmVersion" - 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 project(":vtm-themes") + implementation project(":vtm-android") + implementation project(':vtm-extras') + implementation project(":vtm-http") +// implementation "org.mapsforge:vtm-themes:$vtmVersion" +// implementation "org.mapsforge:vtm-android:$vtmVersion" +// 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" - implementation "org.mapsforge:vtm-gdx:$vtmVersion" - implementation "org.mapsforge:vtm-android-mvt:$vtmVersion" - implementation "org.mapsforge:vtm-mvt:$vtmVersion" + implementation project(":vtm-json") +// implementation project(":vtm-gdx") +// implementation project(":vtm-gdx-poi3d") + implementation project(":vtm-android-mvt") + implementation project(":vtm-mvt") +// implementation "org.mapsforge:vtm-json:$vtmVersion" +// implementation "org.mapsforge:vtm-gdx:$vtmVersion" +// implementation "org.mapsforge:vtm-android-mvt:$vtmVersion" +// implementation "org.mapsforge:vtm-mvt:$vtmVersion" - 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 project(":vtm-android-gdx") +// 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" implementation "com.wdtinc:mapbox-vector-tile:3.1.0" @@ -98,7 +113,8 @@ dependencies { implementation "com.badlogicgames.gdx:gdx:1.11.0" implementation "com.badlogicgames.gdx:gdx-backend-android:1.11.0" implementation "com.caverock:androidsvg:1.4" - api "org.mapsforge:vtm-jts:$vtmVersion" +// api "org.mapsforge:vtm-jts:$vtmVersion" + api project(":vtm-jts") api 'org.locationtech.jts:jts-core:1.19.0' implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11' implementation 'com.squareup.okio:okio:3.3.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fce747eb..690a555d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Mar 21 10:15:37 CST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index b39629d4..edc00b4f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,5 +30,46 @@ dependencyResolutionManagement { } } rootProject.name = "OMQualityInspection" + include ':app' include ':collect-library' +//include ':vtm:vtm' +//include ':vtm:vtm-android' +//include ':vtm:vtm-android-gdx' +//include ':vtm:vtm-android-mvt' +//include ':vtm:vtm-extras' +//include ':vtm:vtm-gdx' +//include ':vtm:vtm-gdx-poi3d' +//include ':vtm:vtm-http' +//include ':vtm:vtm-json' +//include ':vtm:vtm-jts' +//include ':vtm:vtm-models' +//include ':vtm:vtm-mvt' +//include ':vtm:vtm-theme-comparator' +//include ':vtm:vtm-themes' +include ':vtm' +include ':vtm-models' +include ':vtm-themes' +include ':vtm-android-mvt' +include ':vtm-android-gdx' +include ':vtm-android' +include ':vtm-mvt' +include ':vtm-gdx' +include ':vtm-jts' +include ':vtm-http' +include ':vtm-json' +include ':vtm-extras' +include ':vtm-gdx-poi3d' +project(':vtm').projectDir = new File(rootDir, 'vtm/vtm/') +project(':vtm-models').projectDir = new File(rootDir, 'vtm/vtm-models/') +project(':vtm-themes').projectDir = new File(rootDir, 'vtm/vtm-themes/') +project(':vtm-android-mvt').projectDir = new File(rootDir, 'vtm/vtm-android-mvt/') +project(':vtm-android-gdx').projectDir = new File(rootDir, 'vtm/vtm-android-gdx/') +project(':vtm-android').projectDir = new File(rootDir, 'vtm/vtm-android/') +project(':vtm-mvt').projectDir = new File(rootDir, 'vtm/vtm-mvt/') +project(':vtm-gdx').projectDir = new File(rootDir, 'vtm/vtm-gdx/') +project(':vtm-jts').projectDir = new File(rootDir, 'vtm/vtm-jts/') +project(':vtm-http').projectDir = new File(rootDir, 'vtm/vtm-http/') +project(':vtm-json').projectDir = new File(rootDir, 'vtm/vtm-json/') +project(':vtm-extras').projectDir = new File(rootDir, 'vtm/vtm-extras/') +project(':vtm-gdx-poi3d').projectDir = new File(rootDir, 'vtm/vtm-gdx-poi3d/') diff --git a/vtm b/vtm new file mode 160000 index 00000000..1ee201a4 --- /dev/null +++ b/vtm @@ -0,0 +1 @@ +Subproject commit 1ee201a41f78f169873848209a3f3bdac36f185a