diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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 c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
index 1924ed1..dd6d452 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
@@ -63,14 +63,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -108,7 +108,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
index 1924ed1..dd6d452 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
@@ -63,14 +63,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -108,7 +108,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
index 6d72568..c4468cc 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
@@ -36,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 -> {
@@ -51,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
index 1924ed1..dd6d452 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
@@ -63,14 +63,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -108,7 +108,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
index 6d72568..c4468cc 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
@@ -36,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 -> {
@@ -51,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
index 54803f8..8587822 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
@@ -60,14 +60,14 @@
         val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.queryWellInfo(deviceId)
-        wellViewModel.wellResultModel.observe(this, {
+        wellViewModel.wellResultModel.observe(this) {
             if (it.code == 200) {
                 val wellInfo = it.data
 
@@ -109,7 +109,7 @@
                     "经纬度异常".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
index 1924ed1..dd6d452 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
@@ -63,14 +63,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -108,7 +108,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
index 6d72568..c4468cc 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
@@ -36,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 -> {
@@ -51,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
index 54803f8..8587822 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
@@ -60,14 +60,14 @@
         val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.queryWellInfo(deviceId)
-        wellViewModel.wellResultModel.observe(this, {
+        wellViewModel.wellResultModel.observe(this) {
             if (it.code == 200) {
                 val wellInfo = it.data
 
@@ -109,7 +109,7 @@
                     "经纬度异常".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
index b5d1d50..92fd858 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
@@ -36,7 +36,7 @@
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
         userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
 
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -51,7 +51,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(it.data!!.sid!!, account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         /**
@@ -62,19 +62,19 @@
                         navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 
     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() {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
index 1924ed1..dd6d452 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
@@ -63,14 +63,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -108,7 +108,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
index 6d72568..c4468cc 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
@@ -36,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 -> {
@@ -51,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
index 54803f8..8587822 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
@@ -60,14 +60,14 @@
         val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.queryWellInfo(deviceId)
-        wellViewModel.wellResultModel.observe(this, {
+        wellViewModel.wellResultModel.observe(this) {
             if (it.code == 200) {
                 val wellInfo = it.data
 
@@ -109,7 +109,7 @@
                     "经纬度异常".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
index b5d1d50..92fd858 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
@@ -36,7 +36,7 @@
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
         userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
 
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -51,7 +51,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(it.data!!.sid!!, account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         /**
@@ -62,19 +62,19 @@
                         navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 
     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() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
index fa5a74d..637a8a7 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
@@ -19,14 +19,14 @@
              * 获取token之后保存用户信息
              * */
             userDetailViewModel.obtainUserDetail()
-            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
                 } else {
                     navigatePageTo<LoginActivity>()
                 }
                 finish()
-            })
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
index 1924ed1..dd6d452 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
@@ -63,14 +63,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -108,7 +108,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
index 6d72568..c4468cc 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
@@ -36,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 -> {
@@ -51,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
index 54803f8..8587822 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
@@ -60,14 +60,14 @@
         val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.queryWellInfo(deviceId)
-        wellViewModel.wellResultModel.observe(this, {
+        wellViewModel.wellResultModel.observe(this) {
             if (it.code == 200) {
                 val wellInfo = it.data
 
@@ -109,7 +109,7 @@
                     "经纬度异常".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
index b5d1d50..92fd858 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
@@ -36,7 +36,7 @@
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
         userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
 
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -51,7 +51,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(it.data!!.sid!!, account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         /**
@@ -62,19 +62,19 @@
                         navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 
     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() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
index fa5a74d..637a8a7 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
@@ -19,14 +19,14 @@
              * 获取token之后保存用户信息
              * */
             userDetailViewModel.obtainUserDetail()
-            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
                 } else {
                     navigatePageTo<LoginActivity>()
                 }
                 finish()
-            })
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
index cfeef98..3c21d30 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
@@ -31,7 +31,7 @@
     override fun initLayoutView(): Int = R.layout.activity_update_data
 
     override fun observeRequestState() {
-        infrastructureViewModel.loadState.observe(this, {
+        infrastructureViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 LoadState.Success -> {
@@ -41,7 +41,7 @@
                 }
                 LoadState.Fail -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun setupTopBarLayout() {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
index 1924ed1..dd6d452 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
@@ -63,14 +63,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -108,7 +108,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
index 6d72568..c4468cc 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
@@ -36,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 -> {
@@ -51,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
index 54803f8..8587822 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
@@ -60,14 +60,14 @@
         val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.queryWellInfo(deviceId)
-        wellViewModel.wellResultModel.observe(this, {
+        wellViewModel.wellResultModel.observe(this) {
             if (it.code == 200) {
                 val wellInfo = it.data
 
@@ -109,7 +109,7 @@
                     "经纬度异常".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
index b5d1d50..92fd858 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
@@ -36,7 +36,7 @@
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
         userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
 
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -51,7 +51,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(it.data!!.sid!!, account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         /**
@@ -62,19 +62,19 @@
                         navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 
     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() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
index fa5a74d..637a8a7 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
@@ -19,14 +19,14 @@
              * 获取token之后保存用户信息
              * */
             userDetailViewModel.obtainUserDetail()
-            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
                 } else {
                     navigatePageTo<LoginActivity>()
                 }
                 finish()
-            })
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
index cfeef98..3c21d30 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
@@ -31,7 +31,7 @@
     override fun initLayoutView(): Int = R.layout.activity_update_data
 
     override fun observeRequestState() {
-        infrastructureViewModel.loadState.observe(this, {
+        infrastructureViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 LoadState.Success -> {
@@ -41,7 +41,7 @@
                 }
                 LoadState.Fail -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun setupTopBarLayout() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
index eb0ad50..6974d3d 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
@@ -46,17 +46,17 @@
     }
 
     override fun observeRequestState() {
-        orderViewModel.loadState.observe(this, {
+        orderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         orderViewModel.obtainWorkOrderDetail(jobId)
-        orderViewModel.detailModel.observe(this, {
+        orderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -149,6 +149,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 c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
index 1924ed1..dd6d452 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
@@ -63,14 +63,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -108,7 +108,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
index 6d72568..c4468cc 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
@@ -36,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 -> {
@@ -51,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
index 54803f8..8587822 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
@@ -60,14 +60,14 @@
         val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.queryWellInfo(deviceId)
-        wellViewModel.wellResultModel.observe(this, {
+        wellViewModel.wellResultModel.observe(this) {
             if (it.code == 200) {
                 val wellInfo = it.data
 
@@ -109,7 +109,7 @@
                     "经纬度异常".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
index b5d1d50..92fd858 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
@@ -36,7 +36,7 @@
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
         userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
 
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -51,7 +51,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(it.data!!.sid!!, account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         /**
@@ -62,19 +62,19 @@
                         navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 
     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() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
index fa5a74d..637a8a7 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
@@ -19,14 +19,14 @@
              * 获取token之后保存用户信息
              * */
             userDetailViewModel.obtainUserDetail()
-            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
                 } else {
                     navigatePageTo<LoginActivity>()
                 }
                 finish()
-            })
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
index cfeef98..3c21d30 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
@@ -31,7 +31,7 @@
     override fun initLayoutView(): Int = R.layout.activity_update_data
 
     override fun observeRequestState() {
-        infrastructureViewModel.loadState.observe(this, {
+        infrastructureViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 LoadState.Success -> {
@@ -41,7 +41,7 @@
                 }
                 LoadState.Fail -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun setupTopBarLayout() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
index eb0ad50..6974d3d 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
@@ -46,17 +46,17 @@
     }
 
     override fun observeRequestState() {
-        orderViewModel.loadState.observe(this, {
+        orderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         orderViewModel.obtainWorkOrderDetail(jobId)
-        orderViewModel.detailModel.observe(this, {
+        orderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -149,6 +149,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt
index 0423e3c..6705670 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt
@@ -80,22 +80,22 @@
     }
 
     override fun observeRequestState() {
-        orderViewModel.loadState.observe(this, {
+        orderViewModel.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,7 +104,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -131,7 +131,7 @@
         })
 
         orderViewModel.obtainWorkOrderDetail(jobId)
-        orderViewModel.detailModel.observe(this, {
+        orderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -267,7 +267,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -287,7 +287,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) {
@@ -301,7 +301,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
index 1924ed1..dd6d452 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
@@ -63,14 +63,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -108,7 +108,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
index 6d72568..c4468cc 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
@@ -36,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 -> {
@@ -51,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
index 54803f8..8587822 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
@@ -60,14 +60,14 @@
         val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.queryWellInfo(deviceId)
-        wellViewModel.wellResultModel.observe(this, {
+        wellViewModel.wellResultModel.observe(this) {
             if (it.code == 200) {
                 val wellInfo = it.data
 
@@ -109,7 +109,7 @@
                     "经纬度异常".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
index b5d1d50..92fd858 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
@@ -36,7 +36,7 @@
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
         userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
 
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -51,7 +51,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(it.data!!.sid!!, account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         /**
@@ -62,19 +62,19 @@
                         navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 
     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() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
index fa5a74d..637a8a7 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
@@ -19,14 +19,14 @@
              * 获取token之后保存用户信息
              * */
             userDetailViewModel.obtainUserDetail()
-            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
                 } else {
                     navigatePageTo<LoginActivity>()
                 }
                 finish()
-            })
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
index cfeef98..3c21d30 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
@@ -31,7 +31,7 @@
     override fun initLayoutView(): Int = R.layout.activity_update_data
 
     override fun observeRequestState() {
-        infrastructureViewModel.loadState.observe(this, {
+        infrastructureViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 LoadState.Success -> {
@@ -41,7 +41,7 @@
                 }
                 LoadState.Fail -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun setupTopBarLayout() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
index eb0ad50..6974d3d 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
@@ -46,17 +46,17 @@
     }
 
     override fun observeRequestState() {
-        orderViewModel.loadState.observe(this, {
+        orderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         orderViewModel.obtainWorkOrderDetail(jobId)
-        orderViewModel.detailModel.observe(this, {
+        orderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -149,6 +149,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt
index 0423e3c..6705670 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt
@@ -80,22 +80,22 @@
     }
 
     override fun observeRequestState() {
-        orderViewModel.loadState.observe(this, {
+        orderViewModel.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,7 +104,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -131,7 +131,7 @@
         })
 
         orderViewModel.obtainWorkOrderDetail(jobId)
-        orderViewModel.detailModel.observe(this, {
+        orderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -267,7 +267,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -287,7 +287,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) {
@@ -301,7 +301,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt
index da20374..cc5c388 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt
@@ -80,22 +80,22 @@
 
     override fun observeRequestState() {
         //数据加载状态处理
-        orderViewModel.loadState.observe(this, {
+        orderViewModel.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,7 +104,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -130,7 +130,7 @@
         })
 
         orderViewModel.obtainWorkOrderDetail(jobId)
-        orderViewModel.detailModel.observe(this, {
+        orderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -225,7 +225,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -245,7 +245,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) {
@@ -259,7 +259,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {

diff --git a/app/build.gradle b/app/build.gradle
index c9f87ce..71947d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,15 +56,15 @@
 }
 
 static def getBuildDate() {
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA)
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA)
     return dateFormat.format(System.currentTimeMillis())
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //基础依赖库
-    implementation files('libs/lite-release.aar')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
@@ -76,8 +76,8 @@
     //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'
@@ -99,8 +99,8 @@
     implementation 'com.google.code.gson:gson:2.9.0'
     //上拉加载下拉刷新
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
-    //高德地图
-    implementation 'com.amap.api:3dmap:latest.integration'
+    //高德导航、定位、地图三合一
+    implementation 'com.amap.api:navi-3dmap:latest.integration'
     //ArcGIS
 //    implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0'
     //桌面角标
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afe45d2..6de45fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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/smart/town/sanxi/extensions/Poi.kt b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
new file mode 100644
index 0000000..2b2bae6
--- /dev/null
+++ b/app/src/main/java/com/casic/smart/town/sanxi/extensions/Poi.kt
@@ -0,0 +1,29 @@
+package com.casic.smart.town.sanxi.extensions
+
+import android.content.Context
+import com.amap.api.maps.model.Poi
+import com.amap.api.navi.AmapNaviPage
+import com.amap.api.navi.AmapNaviParams
+import com.amap.api.navi.AmapNaviType
+import com.amap.api.navi.AmapPageType
+
+/**
+ * 导航扩展函数
+ * */
+fun Poi.showRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.WALK,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
+
+fun Poi.showBusRouteOnMap(context: Context) {
+    val params = AmapNaviParams(
+        null, null, this,
+        AmapNaviType.DRIVER,
+        AmapPageType.ROUTE
+    )
+    AmapNaviPage.getInstance().showRouteActivity(context, params, null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
index 44e7e38..6638e7c 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/StatisticsPageFragment.kt
@@ -49,7 +49,7 @@
         infrastructureViewModel = ViewModelProvider(this)[InfrastructureViewModel::class.java]
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
 
-        pipeViewModel.alarmResultModel.observe(this, {
+        pipeViewModel.alarmResultModel.observe(this) {
             if (it.code == 200) {
                 var totalAlarm = 0
 
@@ -72,9 +72,9 @@
                 //设置柱状图
                 ChartViewHelper.setBarChartData(alarmBarChart, xAxisLabel, barEntries)
             }
-        })
+        }
 
-        pipeViewModel.resultModel.observe(this, {
+        pipeViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val xAxisLabel: MutableList<String> = ArrayList()
                 val dataModel = it.data!!
@@ -105,16 +105,16 @@
                 entryEntries.add(secondEntries)
                 ChartViewHelper.setLineChartData(healthStatusChart, xAxisLabel, entryEntries)
             }
-        })
+        }
 
         //获取窨井监控数据
-        wellViewModel.countResultModel.observe(this, {
+        wellViewModel.countResultModel.observe(this) {
             cfWellView.text = it["cfWell"]
             bfWellView.text = it["bfWell"]
             allWellDataView.text = it["total"]
-        })
+        }
 
-        deviceViewModel.resultModel.observe(this, {
+        deviceViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 val dateRows = ArrayList<DeviceModel.DataModel>()
                 it.data.forEach { data ->
@@ -127,14 +127,14 @@
                 )
                 deviceRecyclerView.adapter = DeviceRecyclerAdapter(requireContext(), dateRows)
             }
-        })
+        }
 
-        infrastructureViewModel.resultModel.observe(this, {
+        infrastructureViewModel.resultModel.observe(this) {
             if (it.code == 200) {
                 infrastructureRv.adapter = InfrastructureAdapter(requireContext(), it.data)
                 SaveKeyValues.putValue(LocaleConstant.INFRASTRUCTURE, it.toJson())
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
index 0ee79fc..84ff12e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
+++ b/app/src/main/java/com/casic/smart/town/sanxi/model/AlarmStatisticsModel.java
@@ -7,7 +7,7 @@
 public class AlarmStatisticsModel {
 
     private int code;
-    private List<DataDTO> data;
+    private List<DataModel> data;
     private String message;
     private boolean success;
 
@@ -19,11 +19,11 @@
         this.code = code;
     }
 
-    public List<DataDTO> getData() {
+    public List<DataModel> getData() {
         return data;
     }
 
-    public void setData(List<DataDTO> data) {
+    public void setData(List<DataModel> data) {
         this.data = data;
     }
 
@@ -43,7 +43,7 @@
         this.success = success;
     }
 
-    public static class DataDTO {
+    public static class DataModel {
         @SerializedName("1")
         private String _$1;
         @SerializedName("2")
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
index 49e2f95..dd02237 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/util/RouteOnMap.kt
@@ -4,8 +4,8 @@
 import android.graphics.Color
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
-import com.pengxh.kt.lite.extensions.showBusRouteOnMap
-import com.pengxh.kt.lite.extensions.showRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showBusRouteOnMap
+import com.casic.smart.town.sanxi.extensions.showRouteOnMap
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 
 object RouteOnMap {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
index 3d7c91c..e7c584e 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -103,7 +103,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
index 8084e2c..30889ed 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt
@@ -62,14 +62,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -107,7 +107,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
index 1924ed1..dd6d452 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt
@@ -63,14 +63,14 @@
         setMapConfig(savedInstanceState)
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.getAllWell()
-        wellViewModel.allWellResult.observe(this, {
+        wellViewModel.allWellResult.observe(this) {
             if (it.code == 200) {
                 val latitudeList: MutableList<Double> = ArrayList()
                 val longitudeList: MutableList<Double> = ArrayList()
@@ -108,7 +108,7 @@
                     }
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
index 6d72568..c4468cc 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt
@@ -36,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 -> {
@@ -51,7 +51,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
index 54803f8..8587822 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt
@@ -60,14 +60,14 @@
         val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
 
         wellViewModel = ViewModelProvider(this)[WellViewModel::class.java]
-        wellViewModel.loadState.observe(this, {
+        wellViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
         wellViewModel.queryWellInfo(deviceId)
-        wellViewModel.wellResultModel.observe(this, {
+        wellViewModel.wellResultModel.observe(this) {
             if (it.code == 200) {
                 val wellInfo = it.data
 
@@ -109,7 +109,7 @@
                     "经纬度异常".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun setMapConfig(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
index b5d1d50..92fd858 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/LoginActivity.kt
@@ -36,7 +36,7 @@
         loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
         userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
 
-        authenticateViewModel.keyModel.observe(this, {
+        authenticateViewModel.keyModel.observe(this) {
             if (it.code == 200) {//用code判断，别的判断可能有坑
                 val keyString = it.data!!.publicKey!!
                 /**
@@ -51,7 +51,7 @@
                     RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!)
                 //登录并获取Token，POST请求
                 loginViewModel.enter(it.data!!.sid!!, account, dataByPublicKey)
-                loginViewModel.enterResultModel.observe(this, { loginResult ->
+                loginViewModel.enterResultModel.observe(this) { loginResult ->
                     if (loginResult.code == 200) {
                         AuthenticationHelper.saveToken(loginResult.data!!.token!!)
                         /**
@@ -62,19 +62,19 @@
                         navigatePageTo<MainActivity>()
                         finish()
                     }
-                })
+                }
             }
-        })
+        }
     }
 
     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() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
index fa5a74d..637a8a7 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/SplashScreenActivity.kt
@@ -19,14 +19,14 @@
              * 获取token之后保存用户信息
              * */
             userDetailViewModel.obtainUserDetail()
-            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity, {
+            userDetailViewModel.userDetailModel.observe(this@SplashScreenActivity) {
                 if (it.code == 200) {
                     navigatePageTo<MainActivity>()
                 } else {
                     navigatePageTo<LoginActivity>()
                 }
                 finish()
-            })
+            }
         }
 
         override fun onTick(millisUntilFinished: Long) {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
index cfeef98..3c21d30 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt
@@ -31,7 +31,7 @@
     override fun initLayoutView(): Int = R.layout.activity_update_data
 
     override fun observeRequestState() {
-        infrastructureViewModel.loadState.observe(this, {
+        infrastructureViewModel.loadState.observe(this) {
             when (it) {
                 LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后")
                 LoadState.Success -> {
@@ -41,7 +41,7 @@
                 }
                 LoadState.Fail -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun setupTopBarLayout() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
index eb0ad50..6974d3d 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt
@@ -46,17 +46,17 @@
     }
 
     override fun observeRequestState() {
-        orderViewModel.loadState.observe(this, {
+        orderViewModel.loadState.observe(this) {
             when (it) {
                 is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中，请稍后")
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
         orderViewModel.obtainWorkOrderDetail(jobId)
-        orderViewModel.detailModel.observe(this, {
+        orderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -149,6 +149,6 @@
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime
             }
-        })
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt
index 0423e3c..6705670 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt
@@ -80,22 +80,22 @@
     }
 
     override fun observeRequestState() {
-        orderViewModel.loadState.observe(this, {
+        orderViewModel.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,7 +104,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -131,7 +131,7 @@
         })
 
         orderViewModel.obtainWorkOrderDetail(jobId)
-        orderViewModel.detailModel.observe(this, {
+        orderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -267,7 +267,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -287,7 +287,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) {
@@ -301,7 +301,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt
index da20374..cc5c388 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt
@@ -80,22 +80,22 @@
 
     override fun observeRequestState() {
         //数据加载状态处理
-        orderViewModel.loadState.observe(this, {
+        orderViewModel.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,7 +104,7 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
@@ -130,7 +130,7 @@
         })
 
         orderViewModel.obtainWorkOrderDetail(jobId)
-        orderViewModel.detailModel.observe(this, {
+        orderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -225,7 +225,7 @@
                         }).build().show()
                 }
             }
-        })
+        }
 
         imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
             override fun onAddImageClick() {
@@ -245,7 +245,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) {
@@ -259,7 +259,7 @@
                     "最多只能上传3张图片".show(this)
                 }
             }
-        })
+        }
     }
 
     private fun selectPicture() {
diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt
index c79b4b7..43b94cb 100644
--- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt
+++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt
@@ -49,15 +49,15 @@
 
     override fun observeRequestState() {
         //数据加载状态处理
-        orderViewModel.loadState.observe(this, {
+        orderViewModel.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 -> {
@@ -66,11 +66,11 @@
                 }
                 else -> LoadingDialogHub.dismiss()
             }
-        })
+        }
     }
 
     override fun initEvent() {
-        orderViewModel.detailModel.observe(this, {
+        orderViewModel.detailModel.observe(this) {
             if (it.code == 200) {
                 val orderDetail = it.data!![0]
                 alarmContentView.text = orderDetail.alarmContentName
@@ -134,6 +134,6 @@
                         }).build().show()
                 }
             }
-        })
+        }
     }
 }
\ No newline at end of file