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

Conflicts: app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
2023-04-26 15:19:25 +08:00
parent cf640cb1d2 a81e2f5d82
commit d00505c22d
56 changed files with 160 additions and 132 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,6 +30,21 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }
+
+    signingConfigs {
+        debug {
+            storeFile file('D:/WrokSpace/OneMapQS/fastmap.keystore')
+            storePassword "navinfo"
+            keyAlias "fastmap"
+            keyPassword "navinfo"
+        }
+    }
+
+    dexOptions {
+        jumboMode = true
+        javaMaxHeapSize "4096M"
+    }
+
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_11
        targetCompatibility JavaVersion.VERSION_11
@@ -58,9 +73,7 @@ android {


 dependencies {
-
    implementation project(':collect-library')
-
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'