fix: 合并代码

2022-11-18 17:41:21 +08:00
parent 10b739c2fb 4602d2eb0a
commit 5b21d8c907
9 changed files with 279 additions and 411 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ android {
        applicationId "com.navinfo.outdoor"
        minSdkVersion 23
        targetSdkVersion 30
-        versionCode 30
+        versionCode 31
        versionName "8.221118"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -86,7 +86,7 @@ dependencies {
    implementation 'com.lzy.net:okgo:3.0.4'
    implementation 'com.lzy.net:okrx2:2.0.2'
    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.readystatesoftware.chuck:library:1.0.4'
+    implementation 'com.readystatesoftware.chuck:library:1.1.0'

    //retrofit+rxJava
    implementation 'com.squareup.retrofit2:retrofit:2.5.0'