diff --git a/app/build.gradle b/app/build.gradle
index 2a13931..05e5c09 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,6 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
@@ -83,8 +82,8 @@
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     //基础依赖库
     implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -97,10 +96,10 @@
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
     //图片加载框架
     implementation 'com.github.bumptech.glide:glide:4.9.0'
@@ -119,10 +118,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德导航
-    implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0'
-    //定位功能
-    implementation 'com.amap.api:location:5.3.1'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //日期选择器
     implementation 'com.jzxiang.pickerview:TimePickerDialog:1.0.1'
     //标签流式布局

diff --git a/app/build.gradle b/app/build.gradle
index 2a13931..05e5c09 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,6 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
@@ -83,8 +82,8 @@
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     //基础依赖库
     implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -97,10 +96,10 @@
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
     //图片加载框架
     implementation 'com.github.bumptech.glide:glide:4.9.0'
@@ -119,10 +118,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德导航
-    implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0'
-    //定位功能
-    implementation 'com.amap.api:location:5.3.1'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //日期选择器
     implementation 'com.jzxiang.pickerview:TimePickerDialog:1.0.1'
     //标签流式布局
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 711b82b..1ade1e4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /><!--拍照需要-->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /><!--安装apk权限-->
     <uses-permission android:name="android.permission.VIBRATE" /><!--震动权限（使用通知功能必选）-->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="getui.permission.GetuiService.${applicationId}" />
     <permission
         android:name="getui.permission.GetuiService.${applicationId}"
@@ -30,11 +31,12 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" /><!-- 适配小米手机 -->
+        tools:ignore="ScopedStorage" />
 
     <application
         android:name=".base.BaseApplication"
         android:allowBackup="true"
+        android:allowNativeHeapPointerTagging="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"

diff --git a/app/build.gradle b/app/build.gradle
index 2a13931..05e5c09 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,6 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
@@ -83,8 +82,8 @@
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     //基础依赖库
     implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -97,10 +96,10 @@
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
     //图片加载框架
     implementation 'com.github.bumptech.glide:glide:4.9.0'
@@ -119,10 +118,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德导航
-    implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0'
-    //定位功能
-    implementation 'com.amap.api:location:5.3.1'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //日期选择器
     implementation 'com.jzxiang.pickerview:TimePickerDialog:1.0.1'
     //标签流式布局
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 711b82b..1ade1e4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /><!--拍照需要-->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /><!--安装apk权限-->
     <uses-permission android:name="android.permission.VIBRATE" /><!--震动权限（使用通知功能必选）-->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="getui.permission.GetuiService.${applicationId}" />
     <permission
         android:name="getui.permission.GetuiService.${applicationId}"
@@ -30,11 +31,12 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" /><!-- 适配小米手机 -->
+        tools:ignore="ScopedStorage" />
 
     <application
         android:name=".base.BaseApplication"
         android:allowBackup="true"
+        android:allowNativeHeapPointerTagging="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt
index ce4f0fb..2b26608 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt
@@ -6,7 +6,6 @@
 
 object LocaleConstant {
     val USER_PERMISSIONS = arrayOf(
-        Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS,
         Manifest.permission.READ_PHONE_STATE,
         Manifest.permission.ACCESS_COARSE_LOCATION,
         Manifest.permission.ACCESS_FINE_LOCATION,