diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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 f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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 f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
index eaf90d2..ddcb90c 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
@@ -20,10 +20,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "接单成功".show(BaseApplication.obtainInstance())
+            "接单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -40,10 +40,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单确认成功".show(BaseApplication.obtainInstance())
+            "工单确认成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -56,10 +56,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "转单成功".show(BaseApplication.obtainInstance())
+            "转单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -72,10 +72,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单处理成功".show(BaseApplication.obtainInstance())
+            "工单处理成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
index eaf90d2..ddcb90c 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
@@ -20,10 +20,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "接单成功".show(BaseApplication.obtainInstance())
+            "接单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -40,10 +40,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单确认成功".show(BaseApplication.obtainInstance())
+            "工单确认成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -56,10 +56,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "转单成功".show(BaseApplication.obtainInstance())
+            "转单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -72,10 +72,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单处理成功".show(BaseApplication.obtainInstance())
+            "工单处理成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
index 48d254b..903b505 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
@@ -24,7 +24,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
index eaf90d2..ddcb90c 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
@@ -20,10 +20,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "接单成功".show(BaseApplication.obtainInstance())
+            "接单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -40,10 +40,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单确认成功".show(BaseApplication.obtainInstance())
+            "工单确认成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -56,10 +56,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "转单成功".show(BaseApplication.obtainInstance())
+            "转单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -72,10 +72,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单处理成功".show(BaseApplication.obtainInstance())
+            "工单处理成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
index 48d254b..903b505 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
@@ -24,7 +24,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
index 7502991..bcf1c23 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
index eaf90d2..ddcb90c 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
@@ -20,10 +20,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "接单成功".show(BaseApplication.obtainInstance())
+            "接单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -40,10 +40,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单确认成功".show(BaseApplication.obtainInstance())
+            "工单确认成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -56,10 +56,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "转单成功".show(BaseApplication.obtainInstance())
+            "转单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -72,10 +72,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单处理成功".show(BaseApplication.obtainInstance())
+            "工单处理成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
index 48d254b..903b505 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
@@ -24,7 +24,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
index 7502991..bcf1c23 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
index ad1ad98..8b4e304 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
index eaf90d2..ddcb90c 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
@@ -20,10 +20,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "接单成功".show(BaseApplication.obtainInstance())
+            "接单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -40,10 +40,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单确认成功".show(BaseApplication.obtainInstance())
+            "工单确认成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -56,10 +56,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "转单成功".show(BaseApplication.obtainInstance())
+            "转单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -72,10 +72,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单处理成功".show(BaseApplication.obtainInstance())
+            "工单处理成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
index 48d254b..903b505 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
@@ -24,7 +24,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
index 7502991..bcf1c23 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
index ad1ad98..8b4e304 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
index fc6e18a..7fe0060 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
@@ -55,7 +55,7 @@
                 response, object : TypeToken<SubordinateModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -67,10 +67,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "修改成功，请重新登录".show(BaseApplication.obtainInstance())
+            "修改成功，请重新登录".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -88,7 +88,7 @@
             ).data
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
index eaf90d2..ddcb90c 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
@@ -20,10 +20,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "接单成功".show(BaseApplication.obtainInstance())
+            "接单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -40,10 +40,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单确认成功".show(BaseApplication.obtainInstance())
+            "工单确认成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -56,10 +56,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "转单成功".show(BaseApplication.obtainInstance())
+            "转单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -72,10 +72,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单处理成功".show(BaseApplication.obtainInstance())
+            "工单处理成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
index 48d254b..903b505 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
@@ -24,7 +24,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
index 7502991..bcf1c23 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
index ad1ad98..8b4e304 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
index fc6e18a..7fe0060 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
@@ -55,7 +55,7 @@
                 response, object : TypeToken<SubordinateModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -67,10 +67,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "修改成功，请重新登录".show(BaseApplication.obtainInstance())
+            "修改成功，请重新登录".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -88,7 +88,7 @@
             ).data
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
index 1ffd840..c966f6e 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
@@ -35,7 +35,7 @@
                 response, object : TypeToken<WellListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -49,7 +49,7 @@
                 response, object : TypeToken<MapWellListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
index eaf90d2..ddcb90c 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
@@ -20,10 +20,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "接单成功".show(BaseApplication.obtainInstance())
+            "接单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -40,10 +40,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单确认成功".show(BaseApplication.obtainInstance())
+            "工单确认成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -56,10 +56,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "转单成功".show(BaseApplication.obtainInstance())
+            "转单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -72,10 +72,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单处理成功".show(BaseApplication.obtainInstance())
+            "工单处理成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
index 48d254b..903b505 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
@@ -24,7 +24,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
index 7502991..bcf1c23 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
index ad1ad98..8b4e304 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
index fc6e18a..7fe0060 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
@@ -55,7 +55,7 @@
                 response, object : TypeToken<SubordinateModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -67,10 +67,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "修改成功，请重新登录".show(BaseApplication.obtainInstance())
+            "修改成功，请重新登录".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -88,7 +88,7 @@
             ).data
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
index 1ffd840..c966f6e 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
@@ -35,7 +35,7 @@
                 response, object : TypeToken<WellListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -49,7 +49,7 @@
                 response, object : TypeToken<MapWellListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
index d025446..117ea51 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
@@ -39,7 +39,7 @@
             map["total"] = convertString(data.getString("total"))
             countResultModel.value = map
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -61,7 +61,7 @@
                 response, object : TypeToken<WellTypeModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -78,7 +78,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -91,13 +91,13 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "操作成功".show(BaseApplication.obtainInstance())
+            "操作成功".show(BaseApplication.get())
             commonResultModel.value = gson.fromJson<CommonResultModel>(
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -115,7 +115,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
index eaf90d2..ddcb90c 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
@@ -20,10 +20,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "接单成功".show(BaseApplication.obtainInstance())
+            "接单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -40,10 +40,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单确认成功".show(BaseApplication.obtainInstance())
+            "工单确认成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -56,10 +56,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "转单成功".show(BaseApplication.obtainInstance())
+            "转单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -72,10 +72,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单处理成功".show(BaseApplication.obtainInstance())
+            "工单处理成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
index 48d254b..903b505 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
@@ -24,7 +24,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
index 7502991..bcf1c23 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
index ad1ad98..8b4e304 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
index fc6e18a..7fe0060 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
@@ -55,7 +55,7 @@
                 response, object : TypeToken<SubordinateModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -67,10 +67,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "修改成功，请重新登录".show(BaseApplication.obtainInstance())
+            "修改成功，请重新登录".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -88,7 +88,7 @@
             ).data
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
index 1ffd840..c966f6e 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
@@ -35,7 +35,7 @@
                 response, object : TypeToken<WellListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -49,7 +49,7 @@
                 response, object : TypeToken<MapWellListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
index d025446..117ea51 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
@@ -39,7 +39,7 @@
             map["total"] = convertString(data.getString("total"))
             countResultModel.value = map
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -61,7 +61,7 @@
                 response, object : TypeToken<WellTypeModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -78,7 +78,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -91,13 +91,13 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "操作成功".show(BaseApplication.obtainInstance())
+            "操作成功".show(BaseApplication.get())
             commonResultModel.value = gson.fromJson<CommonResultModel>(
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -115,7 +115,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt
index 573eaeb..6a28265 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<OrderListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -39,7 +39,7 @@
                 response, object : TypeToken<OrderListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -53,7 +53,7 @@
                 response, object : TypeToken<OrderListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
index eaf90d2..ddcb90c 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
@@ -20,10 +20,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "接单成功".show(BaseApplication.obtainInstance())
+            "接单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -40,10 +40,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单确认成功".show(BaseApplication.obtainInstance())
+            "工单确认成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -56,10 +56,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "转单成功".show(BaseApplication.obtainInstance())
+            "转单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -72,10 +72,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单处理成功".show(BaseApplication.obtainInstance())
+            "工单处理成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
index 48d254b..903b505 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
@@ -24,7 +24,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
index 7502991..bcf1c23 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
index ad1ad98..8b4e304 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
index fc6e18a..7fe0060 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
@@ -55,7 +55,7 @@
                 response, object : TypeToken<SubordinateModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -67,10 +67,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "修改成功，请重新登录".show(BaseApplication.obtainInstance())
+            "修改成功，请重新登录".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -88,7 +88,7 @@
             ).data
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
index 1ffd840..c966f6e 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
@@ -35,7 +35,7 @@
                 response, object : TypeToken<WellListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -49,7 +49,7 @@
                 response, object : TypeToken<MapWellListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
index d025446..117ea51 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
@@ -39,7 +39,7 @@
             map["total"] = convertString(data.getString("total"))
             countResultModel.value = map
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -61,7 +61,7 @@
                 response, object : TypeToken<WellTypeModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -78,7 +78,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -91,13 +91,13 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "操作成功".show(BaseApplication.obtainInstance())
+            "操作成功".show(BaseApplication.get())
             commonResultModel.value = gson.fromJson<CommonResultModel>(
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -115,7 +115,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt
index 573eaeb..6a28265 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<OrderListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -39,7 +39,7 @@
                 response, object : TypeToken<OrderListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -53,7 +53,7 @@
                 response, object : TypeToken<OrderListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt
index cd79bab..e8eb4a5 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt
@@ -36,7 +36,7 @@
             map["over"] = data.getString("over")
             resultModel.value = map
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -50,7 +50,7 @@
                 response, object : TypeToken<OrderStatusModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -67,7 +67,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail

diff --git a/app/build.gradle b/app/build.gradle
index f53f7e1..095bd89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -13,14 +15,13 @@
         }
     }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.app.smartwell"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"]
     }
@@ -48,7 +49,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = defaultConfig.versionName + ".apk"
+            outputFileName = "Casic_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
@@ -59,12 +60,17 @@
     }
 }
 
+static def getBuildDate() {
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    return dateFormat.format(System.currentTimeMillis())
+}
+
 dependencies {
     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'
@@ -76,11 +82,11 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    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'
@@ -99,10 +105,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/libs/lite-release.aar b/app/libs/lite-release.aar
index 9f8c814..45da4df 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1a6908..319526d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.casic.app.smartwell">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <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}"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <!-- iBeancon 功能所需权限 -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -20,10 +31,14 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!--后台定位权限-->
     <uses-permission android:name="android.permission.CAMERA" /><!--相机权限-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--允许程序设置内置sd卡的d读权限-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        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/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
index 30fa233..a3d2639 100644
--- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
+++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt
@@ -13,16 +13,16 @@
     private val kTag = "BaseApplication"
 
     companion object {
-        private var instance: BaseApplication by Delegates.notNull()
+        private var application: BaseApplication by Delegates.notNull()
 
-        fun obtainInstance() = instance
+        fun get() = application
 
         private lateinit var daoSession: DaoSession
     }
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        application = this
         SaveKeyValues.initSharedPreferences(this)
         //推送
         PushManager.getInstance().initialize(this)
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index 313af78..27a06ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -106,16 +106,16 @@
         }
 
         //初始化vm
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
 
         //获取所有窨井数据
         httpCountDownTimer.start()
         LoadingDialogHub.show(requireActivity(), "数据加载中，请稍后...")
         //获取所有窨井数据
         wellListViewModel.obtainAllWell()
-        wellListViewModel.totalWellModel.observe(viewLifecycleOwner, {
+        wellListViewModel.totalWellModel.observe(viewLifecycleOwner) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -161,20 +161,20 @@
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
-        })
+        }
 
         //地图初始化
         initMap(savedInstanceState)
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(viewLifecycleOwner, {
+        wellViewModel.countResultModel.observe(viewLifecycleOwner) {
             homeView.deployedWellView.text = it["bfWell"]
             homeView.unDeployedWellView.text = it["cfWell"]
             homeView.allWellDataView.text = it["total"]
-        })
+        }
 
         //获取工单数据
-        workOrderViewModel.resultModel.observe(viewLifecycleOwner, {
+        workOrderViewModel.resultModel.observe(viewLifecycleOwner) {
             if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 ||
                 it["inHandle"]!!.length > 4 || it["over"]!!.length > 4
             ) {
@@ -187,7 +187,7 @@
             homeView.undeterminedDataView.text = it["beforeConfirm"]
             homeView.inHandleDataView.text = it["inHandle"]
             homeView.completedDataView.text = it["over"]
-        })
+        }
 
         //首页功能块
         val homeRecycleAdapter = HomeRecycleAdapter(requireContext())
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index f12c575..128c7a7 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -56,12 +56,12 @@
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -81,7 +81,7 @@
             userViewModel.updateVersion()
         }
 
-        noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+        noticeSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 Log.d(kTag, "initEvent: 打开")
             } else {
@@ -89,7 +89,7 @@
             }
         }
 
-        userViewModel.versionResultModel.observe(this, {
+        userViewModel.versionResultModel.observe(this) {
             if (BuildConfig.VERSION_NAME == it.version) {
                 "已是最新版本，无需更新".show(requireContext())
             } else {
@@ -110,13 +110,13 @@
                         }
                     }).build().show()
             }
-        })
+        }
 
-        userViewModel.userDetailModel.observe(this, {
+        userViewModel.userDetailModel.observe(this) {
             if (it.code == 200) {
                 userNameView.text = it.data.name
             }
-        })
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
index 43029f0..6e4bcca 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
@@ -56,8 +56,8 @@
             userId = userDataModel.id.toString()
         }
         weakReferenceHandler = WeakReferenceHandler(callback)
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -121,7 +121,7 @@
 //            }
 //        })
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val jobId = orderDetail.jobId.toString()
@@ -137,7 +137,7 @@
             } else {
                 "无法查询到工单详情".show(requireContext())
             }
-        })
+        }
     }
 
     private val callback = Handler.Callback {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
index 68a1502..5d2b5f5 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033101)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
index 74204c6..aaf8201 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt
@@ -37,8 +37,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun onResume() {
@@ -64,7 +64,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -88,9 +88,9 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033002)
             }
-        })
+        }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -101,7 +101,7 @@
                     "该工单无流转记录".show(requireContext())
                 }
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
index 0899aa4..6126be6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt
@@ -34,7 +34,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -60,7 +60,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -84,7 +84,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022033001)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
index e707f9f..824e011 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
@@ -40,8 +40,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -52,7 +52,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -66,7 +66,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -82,7 +82,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -106,7 +106,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032901)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
index 9983243..bdf69a6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
@@ -43,8 +43,8 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun onResume() {
@@ -54,7 +54,7 @@
 
     override fun observeRequestState() {
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中，请稍后")
                 is LoadState.Success -> {
@@ -68,7 +68,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -84,7 +84,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -108,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040601)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
index 6451558..40bd7de 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt
@@ -37,7 +37,7 @@
 
     override fun initData() {
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java)
+        workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -62,7 +62,7 @@
             obtainWorkOrderList()
         }
 
-        workOrderListViewModel.resultModel.observe(this, {
+        workOrderListViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -86,7 +86,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040801)
             }
-        })
+        }
     }
 
     private fun obtainWorkOrderList() {
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
index e8f8a18..8a5f380 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt
@@ -13,7 +13,7 @@
         }
     }
 
-    private val beanDao = BaseApplication.obtainInstance().obtainDaoSession().noticeLocaleBeanDao
+    private val beanDao = BaseApplication.get().obtainDaoSession().noticeLocaleBeanDao
 
     fun insertNotice(
         messageId: String, appid: String, clientId: String,
@@ -34,7 +34,7 @@
         noticeLocaleBean.noticeTime = noticeTime
         beanDao.insert(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun deleteNoticeByMessageId(messageId: String) {
@@ -43,7 +43,7 @@
         ).list()
         beanDao.deleteInTx(result)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
     fun updateNoticeByMessageId(messageId: String) {
@@ -53,12 +53,12 @@
         noticeLocaleBean.isRead = "1"
         beanDao.update(noticeLocaleBean)
         //角标设置
-        BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice())
+        BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice())
     }
 
 
     fun queryNoticeByPage(userId: String, offset: Int): MutableList<NoticeLocaleBean> {
-        return BaseApplication.obtainInstance().obtainDaoSession()
+        return BaseApplication.get().obtainDaoSession()
             .queryBuilder(NoticeLocaleBean::class.java)
             .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId))
             .offset(offset * LocaleConstant.PAGE_LIMIT)
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 5005bc9..1a4c382 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,
diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
index 9e5cdd9..fdfccbc 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
@@ -4,7 +4,9 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.isLetterAndDigit
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.UserViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -34,11 +36,11 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        userViewModel.loadState.observe(this, {
+        userViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
                 is LoadState.Success -> {
@@ -49,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
index 3429375..78990bd 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
@@ -4,7 +4,10 @@
 import android.os.CountDownTimer
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.utils.*
+import com.casic.app.smartwell.utils.AuthenticationHelper
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.utils.LocaleConstant
+import com.casic.app.smartwell.utils.RSAUtils
 import com.casic.app.smartwell.vm.AuthenticateViewModel
 import com.casic.app.smartwell.vm.LoginViewModel
 import com.casic.app.smartwell.vm.UserViewModel
@@ -34,19 +37,19 @@
         // 设置默认账号密码
         userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
         userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String)
-        authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java]
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        authenticateViewModel.loadState.observe(this, {
+        authenticateViewModel.loadState.observe(this) {
             LoadingDialogHub.show(this, "登录中，请稍后")
-        })
+        }
 
-        loginViewModel.loadState.observe(this, {
+        loginViewModel.loadState.observe(this) {
             LoadingDialogHub.dismiss()
-        })
+        }
     }
 
     override fun initEvent() {
@@ -94,7 +97,7 @@
             SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword)
             authenticateViewModel.obtainPublicKey()
         }
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -109,7 +112,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         //获取token之后保存用户信息
@@ -118,8 +121,8 @@
                         this.navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
index 50581da..920e610 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt
@@ -52,16 +52,16 @@
     override fun initData() {
         //推送，多次调用 SDK 初始化并无影响。
         PushManager.getInstance().initialize(this)
-        pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java)
+        pushViewModel = ViewModelProvider(this)[PushViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler {
             pushViewModel.registerPush(it.obj as String)
             true
         }
-        pushViewModel.registerResultModel.observe(this, {
+        pushViewModel.registerResultModel.observe(this) {
             if (it.code == 200) {
                 Log.d(kTag, "推送注册结果: ${it.toJson()}")
             }
-        })
+        }
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
index ff4017e..5a4b8e3 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
@@ -4,7 +4,8 @@
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.toChinese
 import com.casic.app.smartwell.utils.LoadingDialogHub
 import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.gyf.immersionbar.ImmersionBar
@@ -40,21 +41,21 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -147,6 +148,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
index 0b33cb3..ea47690 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
@@ -12,9 +12,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -71,29 +78,29 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -102,10 +109,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //处理完成工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -114,7 +121,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -141,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -254,7 +261,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -293,7 +300,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交工单处理
                 submitButton.setOnClickListener {
@@ -336,7 +343,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -356,7 +363,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -370,7 +377,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
index 5558f37..e1da183 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
@@ -11,9 +11,16 @@
 import androidx.lifecycle.ViewModelProvider
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.callback.OnImageCompressListener
-import com.casic.app.smartwell.extensions.*
-import com.casic.app.smartwell.utils.*
-import com.casic.app.smartwell.vm.*
+import com.casic.app.smartwell.extensions.combineImagePath
+import com.casic.app.smartwell.extensions.compressImage
+import com.casic.app.smartwell.extensions.reformat
+import com.casic.app.smartwell.extensions.toChinese
+import com.casic.app.smartwell.utils.GlideLoadEngine
+import com.casic.app.smartwell.utils.LoadingDialogHub
+import com.casic.app.smartwell.vm.OperationViewModel
+import com.casic.app.smartwell.vm.UploadImageViewModel
+import com.casic.app.smartwell.vm.UserViewModel
+import com.casic.app.smartwell.vm.WorkOrderViewModel
 import com.casic.app.smartwell.widgets.SingleChoiceDialog
 import com.casic.app.smartwell.widgets.TimeLineBottomSheet
 import com.gyf.immersionbar.ImmersionBar
@@ -34,7 +41,6 @@
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.*
-import kotlinx.android.synthetic.main.activity_well_management.*
 import kotlinx.android.synthetic.main.include_base_order_detail.*
 import kotlinx.android.synthetic.main.include_base_title.*
 import java.io.File
@@ -72,30 +78,30 @@
         addImageRecyclerView.adapter = imageAdapter
 
         weakReferenceHandler = WeakReferenceHandler(callback)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java)
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java]
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
-        uploadImageViewModel.loadState.observe(this, {
+        uploadImageViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //转单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "转单中，请稍后")
                 is LoadState.Success -> {
@@ -104,10 +110,10 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //确认工单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -116,7 +122,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -142,7 +148,7 @@
         })
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -203,7 +209,7 @@
                 transferOrderButton.setOnClickListener {
                     userViewModel.obtainSubordinate("0", "", "leader,member")
                 }
-                userViewModel.subordinateModel.observe(this, { subordinate ->
+                userViewModel.subordinateModel.observe(this) { subordinate ->
                     if (subordinate.code == 200) {
                         val roleArray: ArrayList<String> = ArrayList() //下级流转人员集合
                         subordinate.data?.forEach { dataBean ->
@@ -242,7 +248,7 @@
                                 }
                             }).build().show()
                     }
-                })
+                }
 
                 //提交
                 submitButton.setOnClickListener {
@@ -297,7 +303,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -317,7 +323,7 @@
                 imageAdapter.deleteImage(position)
             }
         })
-        uploadImageViewModel.resultModel.observe(this, {
+        uploadImageViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1
                 if (sumItemCount <= 4) {
@@ -331,7 +337,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
index 5a1bab3..fd579af 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
@@ -45,24 +45,24 @@
 
     override fun initData() {
         this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
 
         workOrderViewModel.obtainWorkOrderDetail(jobId)
     }
 
     override fun observeRequestState() {
         //数据加载状态处理
-        workOrderViewModel.loadState.observe(this, {
+        workOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
 
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -71,11 +71,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -148,7 +148,7 @@
                     }
                     wellViewModel.obtainWellDetail(wellId)
                 }
-                wellViewModel.wellDetailModel.observe(this, { well ->
+                wellViewModel.wellDetailModel.observe(this) { well ->
                     if (well.code == 200) {
                         val wellDetail = well.data!!
                         val lat = wellDetail.latGaode.toString()
@@ -163,8 +163,8 @@
                             )
                         }
                     }
-                })
+                }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
index 71393f3..173d3b5 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt
@@ -54,9 +54,9 @@
     override fun initData() {
         inflater = LayoutInflater.from(this)
         //告警内容
-        alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java)
+        alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
         //工单状态
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -65,7 +65,7 @@
 
     override fun initEvent() {
         alarmViewModel.obtainAlarmContentType("1")
-        alarmViewModel.listModel.observe(this, {
+        alarmViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = AlarmContentModel.DataBean.ListBean()
@@ -98,7 +98,7 @@
                     true
                 }
             }
-        })
+        }
 
         val levelMaps: MutableList<Map<String, String>> = ArrayList()
         for (i in 0..3) {
@@ -126,7 +126,7 @@
         }
 
         workOrderViewModel.obtainOrderStatus()
-        workOrderViewModel.orderStatusModel.observe(this, {
+        workOrderViewModel.orderStatusModel.observe(this) {
             if (it.code == 200) {
                 //构造一个默认值
                 val bean = OrderStatusModel.DataBean()
@@ -157,7 +157,7 @@
                     true
                 }
             }
-        })
+        }
 
         startTimeView.setOnClickListener {
             TimePickerDialog.Builder()
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
index bc18b26..8c93ff7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
@@ -60,20 +60,20 @@
     override fun initData() {
         args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
         weakReferenceHandler = WeakReferenceHandler(callback)
-        searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java)
-        operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java)
-        workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
+        searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java]
+        operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java]
+        workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        searchOrderViewModel.loadState.observe(this, {
+        searchOrderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         //接单状态处理
-        operationViewModel.loadState.observe(this, {
+        operationViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "接单中，请稍后")
                 is LoadState.Success -> {
@@ -87,12 +87,12 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         obtainSearchResult()
-        searchOrderViewModel.listModel.observe(this, {
+        searchOrderViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -116,7 +116,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022040101)
             }
-        })
+        }
 
         resultRefreshLayout.setOnRefreshListener {
             isRefresh = true
@@ -130,7 +130,7 @@
             obtainSearchResult()
         }
 
-        workOrderViewModel.detailModel.observe(this, {
+        workOrderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 val orderFlow = orderDetail.flow!!
@@ -143,7 +143,7 @@
                     "抱歉，无法查到该工单的流转记录".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun obtainSearchResult() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
index f53ee53..f031966 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt
@@ -17,14 +17,14 @@
              * 获取token之后保存用户信息
              * */
             userViewModel.obtainUserDetail()
-            userViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
-                    finish()
+                } else {
+                    navigatePageTo<LoginActivity>()
                 }
-            })
-            navigatePageTo<LoginActivity>()
-            finish()
+                finish()
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
@@ -39,7 +39,7 @@
     }
 
     override fun initData() {
-        userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
+        userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
index ba47ddd..138b9c1 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt
@@ -50,7 +50,7 @@
             userDeptView.text = userDataModel.deptName
             userPhoneView.text = userDataModel.phone
         }
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
     }
 
     override fun observeRequestState() {
@@ -78,12 +78,12 @@
                     override fun onCancelClick() {}
                 }).build().show()
         }
-        loginViewModel.outResultModel.observe(this, {
+        loginViewModel.outResultModel.observe(this) {
             if (it.code == 200) {
                 AuthenticationHelper.removeToken()
                 this.navigatePageTo<LoginActivity>()
                 PageNavigationManager.finishAllActivity()
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
index 802d9dc..fe0125a 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
@@ -41,7 +41,7 @@
 
     override fun initData() {
         val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
         wellViewModel.obtainWellDetail(wellId)
 
         //监控内容
@@ -51,16 +51,16 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        wellViewModel.wellDetailModel.observe(this, {
+        wellViewModel.wellDetailModel.observe(this) {
             if (it.code == 200) {
                 val wellDetail = it.data!!
                 wellCodeView.text = wellDetail.wellCode
@@ -135,6 +135,6 @@
                     )
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
index 6987ed1..25855ca 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellListAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.RouteOnMap
@@ -53,8 +54,8 @@
     override fun initData() {
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
@@ -64,7 +65,7 @@
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
                 it.data!!.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
@@ -80,10 +81,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         obtainWellList()
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -107,7 +108,7 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032501)
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
index 043ccf4..20da942 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
@@ -36,21 +36,21 @@
 
     override fun initData() {
         this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!!
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainMonitorResult(wellId)
-        wellViewModel.monitorModel.observe(this, {
+        wellViewModel.monitorModel.observe(this) {
             if (it.code == 200) {
                 if (it.data?.size == 0) {
                     emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") {
@@ -63,6 +63,6 @@
                     sensorListView!!.adapter = sensorListAdapter
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
index 6b7d0dd..f9131e7 100644
--- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
@@ -7,7 +7,8 @@
 import com.amap.api.maps.model.LatLng
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.WellOperationAdapter
-import com.casic.app.smartwell.extensions.*
+import com.casic.app.smartwell.extensions.arrowAnimation
+import com.casic.app.smartwell.extensions.showEmptyPage
 import com.casic.app.smartwell.model.WellListModel
 import com.casic.app.smartwell.model.WellTypeModel
 import com.casic.app.smartwell.utils.LoadingDialogHub
@@ -57,8 +58,8 @@
         easyPopupWindow = WellTypePopupWindow(this)
         easyPopupWindow.setBackgroundDrawable(null)
         weakReferenceHandler = WeakReferenceHandler(callback)
-        wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java)
-        wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java)
+        wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
+        wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java]
     }
 
     override fun onResume() {
@@ -67,7 +68,7 @@
     }
 
     override fun observeRequestState() {
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 is LoadState.Success -> {
@@ -76,14 +77,14 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         wellViewModel.obtainWellType()
-        wellViewModel.wellTypeModel.observe(this, {
+        wellViewModel.wellTypeModel.observe(this) {
             if (it.code == 200) {
-                it.data!!.forEachIndexed { index, dataBean ->
+                it.data?.forEachIndexed { index, dataBean ->
                     val bean: WellTypeModel.DataBean
                     if (index == 0) {
                         bean = WellTypeModel.DataBean()
@@ -97,10 +98,10 @@
                 }
                 easyPopupWindow.setupPopupData(items)
             }
-        })
+        }
 
         //数据监听
-        wellListViewModel.listModel.observe(this, {
+        wellListViewModel.listModel.observe(this) {
             if (it.code == 200) {
                 val dataRows = it.data?.rows
                 when {
@@ -124,10 +125,10 @@
                 }
                 weakReferenceHandler.sendEmptyMessage(2022032801)
             }
-        })
+        }
 
         //撤防布防状态监听
-        wellViewModel.commonResultModel.observe(this, {
+        wellViewModel.commonResultModel.observe(this) {
             if (it.code == 200) {
                 val rowsBean = dataBeans[clickedPosition]
                 if (rowsBean.bfztName == "布防") {
@@ -138,7 +139,7 @@
                     rowsBean.bfztName = "布防"
                 }
             }
-        })
+        }
 
         wellTypeLayout.setOnClickListener {
             arrowImageView.arrowAnimation(180f)
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
index df653f6..1031d28 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<AlarmContentModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
index 16f4fd5..804ef79 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt
@@ -27,7 +27,7 @@
                 response, object : TypeToken<PublicKeyModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
index 59f7960..c7a8af6 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<DeviceDetailModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
index d7ce465..dc7035d 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt
@@ -27,10 +27,10 @@
             enterResultModel.value = gson.fromJson<LoginResultModel>(
                 response, object : TypeToken<LoginResultModel>() {}.type
             )
-            "登录成功".show(BaseApplication.obtainInstance())
+            "登录成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -45,7 +45,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
index eaf90d2..ddcb90c 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt
@@ -20,10 +20,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "接单成功".show(BaseApplication.obtainInstance())
+            "接单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -40,10 +40,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单确认成功".show(BaseApplication.obtainInstance())
+            "工单确认成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -56,10 +56,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "转单成功".show(BaseApplication.obtainInstance())
+            "转单成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -72,10 +72,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "工单处理成功".show(BaseApplication.obtainInstance())
+            "工单处理成功".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
index 48d254b..903b505 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt
@@ -24,7 +24,7 @@
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
index 7502991..bcf1c23 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
index ad1ad98..8b4e304 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt
@@ -30,7 +30,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
index fc6e18a..7fe0060 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt
@@ -55,7 +55,7 @@
                 response, object : TypeToken<SubordinateModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -67,10 +67,10 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "修改成功，请重新登录".show(BaseApplication.obtainInstance())
+            "修改成功，请重新登录".show(BaseApplication.get())
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -88,7 +88,7 @@
             ).data
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
index 1ffd840..c966f6e 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt
@@ -35,7 +35,7 @@
                 response, object : TypeToken<WellListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -49,7 +49,7 @@
                 response, object : TypeToken<MapWellListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
index d025446..117ea51 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt
@@ -39,7 +39,7 @@
             map["total"] = convertString(data.getString("total"))
             countResultModel.value = map
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -61,7 +61,7 @@
                 response, object : TypeToken<WellTypeModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -78,7 +78,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -91,13 +91,13 @@
         val responseCode = response.separateResponseCode()
         if (responseCode == 200) {
             loadState.value = LoadState.Success
-            "操作成功".show(BaseApplication.obtainInstance())
+            "操作成功".show(BaseApplication.get())
             commonResultModel.value = gson.fromJson<CommonResultModel>(
                 response, object : TypeToken<CommonResultModel>() {}.type
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
@@ -115,7 +115,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt
index 573eaeb..6a28265 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt
@@ -25,7 +25,7 @@
                 response, object : TypeToken<OrderListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -39,7 +39,7 @@
                 response, object : TypeToken<OrderListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -53,7 +53,7 @@
                 response, object : TypeToken<OrderListModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt
index cd79bab..e8eb4a5 100644
--- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt
+++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt
@@ -36,7 +36,7 @@
             map["over"] = data.getString("over")
             resultModel.value = map
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -50,7 +50,7 @@
                 response, object : TypeToken<OrderStatusModel>() {}.type
             )
         } else {
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         it.printStackTrace()
@@ -67,7 +67,7 @@
             )
         } else {
             loadState.value = LoadState.Fail
-            response.toErrorMessage().show(BaseApplication.obtainInstance())
+            response.toErrorMessage().show(BaseApplication.get())
         }
     }, {
         loadState.value = LoadState.Fail
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1301c40..68bb06e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="mainThemeColor">#1D55C6</color>
-    <color name="mainTextColor">#333333</color>
+    <color name="mainTextColor">#000000</color>
     <color name="subTextColor">#626262</color>
     <color name="mainBackColor">#F7F7FA</color>
     <color name="lightGray">#D3D3D3</color>