version:2.1

fix:修复地图失败，修复获取天气失败
update:

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: "com.tencent.android.tpns"
 
 def appName() {
-    return "桌面"
+    return "老人桌面"
 }
 
 def releaseTime() {
@@ -16,8 +16,8 @@ android {
         applicationId "com.uiui.aios"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 11
-        versionName "2.0"
+        versionCode 12
+        versionName "2.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -31,6 +31,10 @@ android {
                 XG_ACCESS_ID : "1500030457",
                 XG_ACCESS_KEY : "AZZXANJF4HBD",
         ]
+
+        manifestPlaceholders = [
+                AMAP_KEY: "ff08045221483b649cc41e77ee2ad941"
+        ]
     }
 
     lintOptions {
@@ -76,27 +80,19 @@ android {
     buildTypes {
         zhanRuiRelease.initWith(release)
         zhanRuiRelease {
-            manifestPlaceholders = [
-                    AMAP_KEY: "70f37634f84b00c5c7347c545bc2a3b9"
-            ]
             buildConfigField "boolean", "LOG_DEBUG", "false"
             signingConfig signingConfigs.zhanRui
         }
 
         zhanRuiDebug.initWith(debug)
         zhanRuiDebug {
-            manifestPlaceholders = [
-                    AMAP_KEY: "70f37634f84b00c5c7347c545bc2a3b9"
-            ]
+
             buildConfigField "boolean", "LOG_DEBUG", "true"
             versionNameSuffix "-debug"
             debuggable true
             signingConfig signingConfigs.zhanRui
         }
         debug {
-            manifestPlaceholders = [
-                    AMAP_KEY: "e7c2b3cb84ca7ac4100b1ffceb3d5685"
-            ]
             // 显示Log
             buildConfigField "boolean", "LOG_DEBUG", "true"
             versionNameSuffix "-debug"
@@ -114,9 +110,6 @@ android {
             }
         }
         release {
-            manifestPlaceholders = [
-                    AMAP_KEY: "e7c2b3cb84ca7ac4100b1ffceb3d5685"
-            ]
             // 不显示Log
             buildConfigField "boolean", "LOG_DEBUG", "false"
             //混淆
@@ -147,7 +140,7 @@ android {
 dependencies {
 //    implementation fileTree(dir: 'libs', include: ['*.jar'])
     compileOnly files('libs/framework.jar')
-    implementation files('libs/QWeather_Public_Android_V4.6.jar')
+    implementation files('libs/QWeather_Public_Android_V4.9.jar')
     //保持1.3.1 更新会报错
     implementation 'androidx.appcompat:appcompat:1.3.1'
     //2.0.4以上无法预览
@@ -176,7 +169,7 @@ dependencies {
     implementation "com.squareup.retrofit2:adapter-rxjava3:2.9.0"
     //Gson
     implementation 'com.google.code.gson:gson:2.9.0'
-    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'com.google.zxing:core:3.5.0'
     //生命周期管理
     implementation 'com.trello.rxlifecycle4:rxlifecycle:4.0.2'
     implementation 'com.trello.rxlifecycle4:rxlifecycle-android:4.0.2'
@@ -190,7 +183,7 @@ dependencies {
     implementation 'com.amap.api:location:5.1.0'
     //MMKV
     implementation 'com.tencent:mmkv-static:1.2.12'
-    implementation 'com.tencent.tpns:tpns:1.3.4.1-release'
+    implementation 'com.tencent.tpns:tpns:1.3.4.3-release'
     //状态栏透明
     implementation 'com.gitee.zackratos:UltimateBarX:0.8.0'
     //指示器