diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..fb00ab5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/bg_toast_layout.xml" value="0.3703125" />
+        <entry key="app/src/main/res/drawable/ic_add_pic.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_imag_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/layout/activity_big_image.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/activity_event_detail.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_event_list.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.35" />
+        <entry key="app/src/main/res/layout/activity_map.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_new_event.xml" value="0.21481481481481482" />
+        <entry key="app/src/main/res/layout/activity_query_inspect.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/include_base_title.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_big_picture.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/item_image_gridview.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_inspect_recycleview.xml" value="0.2203125" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..fb00ab5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/bg_toast_layout.xml" value="0.3703125" />
+        <entry key="app/src/main/res/drawable/ic_add_pic.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_imag_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/layout/activity_big_image.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/activity_event_detail.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_event_list.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.35" />
+        <entry key="app/src/main/res/layout/activity_map.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_new_event.xml" value="0.21481481481481482" />
+        <entry key="app/src/main/res/layout/activity_query_inspect.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/include_base_title.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_big_picture.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/item_image_gridview.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_inspect_recycleview.xml" value="0.2203125" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..fb00ab5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/bg_toast_layout.xml" value="0.3703125" />
+        <entry key="app/src/main/res/drawable/ic_add_pic.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_imag_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/layout/activity_big_image.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/activity_event_detail.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_event_list.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.35" />
+        <entry key="app/src/main/res/layout/activity_map.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_new_event.xml" value="0.21481481481481482" />
+        <entry key="app/src/main/res/layout/activity_query_inspect.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/include_base_title.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_big_picture.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/item_image_gridview.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_inspect_recycleview.xml" value="0.2203125" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9d49cae..a40143c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,19 +12,16 @@
             keyPassword '123456789'
         }
     }
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.birmm.inspect"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "2.0.0"
-        ndk {
-            //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
+        ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" }
     }
 
     buildTypes {
@@ -55,10 +52,9 @@
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //腾讯Android UI框架
@@ -69,12 +65,12 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
     //返回值转换器
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
@@ -83,7 +79,7 @@
     implementation 'com.squareup.okhttp3:logging-interceptor:4.6.0'
     //网络请求和接口封装
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     //官方Json解析库
     implementation 'com.google.code.gson:gson:2.8.6'
     //上拉加载下拉刷新

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..fb00ab5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/bg_toast_layout.xml" value="0.3703125" />
+        <entry key="app/src/main/res/drawable/ic_add_pic.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_imag_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/layout/activity_big_image.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/activity_event_detail.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_event_list.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.35" />
+        <entry key="app/src/main/res/layout/activity_map.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_new_event.xml" value="0.21481481481481482" />
+        <entry key="app/src/main/res/layout/activity_query_inspect.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/include_base_title.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_big_picture.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/item_image_gridview.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_inspect_recycleview.xml" value="0.2203125" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9d49cae..a40143c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,19 +12,16 @@
             keyPassword '123456789'
         }
     }
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.birmm.inspect"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "2.0.0"
-        ndk {
-            //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
+        ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" }
     }
 
     buildTypes {
@@ -55,10 +52,9 @@
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //腾讯Android UI框架
@@ -69,12 +65,12 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
     //返回值转换器
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
@@ -83,7 +79,7 @@
     implementation 'com.squareup.okhttp3:logging-interceptor:4.6.0'
     //网络请求和接口封装
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     //官方Json解析库
     implementation 'com.google.code.gson:gson:2.8.6'
     //上拉加载下拉刷新
diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
new file mode 100644
index 0000000..00c0d76
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
@@ -0,0 +1,16 @@
+package com.casic.birmm.inspect.utils
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import java.lang.ref.WeakReference
+
+class WeakReferenceHandler(callback: Callback) : Handler(Looper.getMainLooper()) {
+
+    private var weakReference: WeakReference<Callback> = WeakReference(callback)
+
+    override fun handleMessage(msg: Message) {
+        super.handleMessage(msg)
+        weakReference.get()?.handleMessage(msg)
+    }
+}
\ No newline at end of file

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..fb00ab5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/bg_toast_layout.xml" value="0.3703125" />
+        <entry key="app/src/main/res/drawable/ic_add_pic.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_imag_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/layout/activity_big_image.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/activity_event_detail.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_event_list.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.35" />
+        <entry key="app/src/main/res/layout/activity_map.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_new_event.xml" value="0.21481481481481482" />
+        <entry key="app/src/main/res/layout/activity_query_inspect.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/include_base_title.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_big_picture.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/item_image_gridview.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_inspect_recycleview.xml" value="0.2203125" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9d49cae..a40143c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,19 +12,16 @@
             keyPassword '123456789'
         }
     }
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.birmm.inspect"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "2.0.0"
-        ndk {
-            //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
+        ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" }
     }
 
     buildTypes {
@@ -55,10 +52,9 @@
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //腾讯Android UI框架
@@ -69,12 +65,12 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
     //返回值转换器
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
@@ -83,7 +79,7 @@
     implementation 'com.squareup.okhttp3:logging-interceptor:4.6.0'
     //网络请求和接口封装
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     //官方Json解析库
     implementation 'com.google.code.gson:gson:2.8.6'
     //上拉加载下拉刷新
diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
new file mode 100644
index 0000000..00c0d76
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
@@ -0,0 +1,16 @@
+package com.casic.birmm.inspect.utils
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import java.lang.ref.WeakReference
+
+class WeakReferenceHandler(callback: Callback) : Handler(Looper.getMainLooper()) {
+
+    private var weakReference: WeakReference<Callback> = WeakReference(callback)
+
+    override fun handleMessage(msg: Message) {
+        super.handleMessage(msg)
+        weakReference.get()?.handleMessage(msg)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
index 880487a..5a0e996 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -12,26 +12,22 @@
 import com.casic.birmm.inspect.extensions.filterString
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.EventListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.EventQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_event.*
-import kotlinx.android.synthetic.main.activity_query_inspect.emptyView
 import kotlinx.android.synthetic.main.activity_query_inspect.endDateView
 import kotlinx.android.synthetic.main.activity_query_inspect.inputTipsView
 import kotlinx.android.synthetic.main.activity_query_inspect.refreshLayout
 import kotlinx.android.synthetic.main.activity_query_inspect.searchView
 import kotlinx.android.synthetic.main.activity_query_inspect.startDateView
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 class EventQueryActivity : BaseViewModelActivity<EventQueryViewModel>() {
 
+    private val context: Context = this@EventQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -55,7 +51,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryEvent(
             keywords = keywords,
             startTime = startTime,
@@ -163,42 +159,35 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: EventQueryActivity) : Handler() {
-        private val reference: WeakReference<EventQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210712) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            EventSearchListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.eventRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.eventRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            EventSearchListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent = Intent(resultActivity, EventDetailActivity::class.java)
-                                val rowsBean = resultActivity.dataBeans[position]
-                                intent.putExtra("createTime", rowsBean.createTime)
-                                intent.putExtra(
-                                    "description",
-                                    rowsBean.description!!.filterString()
-                                )
-                                intent.putExtra("data", rowsBean.data)
-                                intent.putExtra("images", rowsBean.images)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210712) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = EventSearchListAdapter(this, dataBeans)
+                    eventRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    eventRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        EventSearchListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, EventDetailActivity::class.java)
+                            val rowsBean = dataBeans[position]
+                            intent.putExtra("createTime", rowsBean.createTime)
+                            intent.putExtra(
+                                "description", rowsBean.description!!.filterString()
+                            )
+                            intent.putExtra("data", rowsBean.data)
+                            intent.putExtra("images", rowsBean.images)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..fb00ab5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/bg_toast_layout.xml" value="0.3703125" />
+        <entry key="app/src/main/res/drawable/ic_add_pic.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_imag_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/layout/activity_big_image.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/activity_event_detail.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_event_list.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.35" />
+        <entry key="app/src/main/res/layout/activity_map.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_new_event.xml" value="0.21481481481481482" />
+        <entry key="app/src/main/res/layout/activity_query_inspect.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/include_base_title.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_big_picture.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/item_image_gridview.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_inspect_recycleview.xml" value="0.2203125" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9d49cae..a40143c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,19 +12,16 @@
             keyPassword '123456789'
         }
     }
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.birmm.inspect"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "2.0.0"
-        ndk {
-            //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
+        ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" }
     }
 
     buildTypes {
@@ -55,10 +52,9 @@
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //腾讯Android UI框架
@@ -69,12 +65,12 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
     //返回值转换器
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
@@ -83,7 +79,7 @@
     implementation 'com.squareup.okhttp3:logging-interceptor:4.6.0'
     //网络请求和接口封装
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     //官方Json解析库
     implementation 'com.google.code.gson:gson:2.8.6'
     //上拉加载下拉刷新
diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
new file mode 100644
index 0000000..00c0d76
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
@@ -0,0 +1,16 @@
+package com.casic.birmm.inspect.utils
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import java.lang.ref.WeakReference
+
+class WeakReferenceHandler(callback: Callback) : Handler(Looper.getMainLooper()) {
+
+    private var weakReference: WeakReference<Callback> = WeakReference(callback)
+
+    override fun handleMessage(msg: Message) {
+        super.handleMessage(msg)
+        weakReference.get()?.handleMessage(msg)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
index 880487a..5a0e996 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -12,26 +12,22 @@
 import com.casic.birmm.inspect.extensions.filterString
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.EventListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.EventQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_event.*
-import kotlinx.android.synthetic.main.activity_query_inspect.emptyView
 import kotlinx.android.synthetic.main.activity_query_inspect.endDateView
 import kotlinx.android.synthetic.main.activity_query_inspect.inputTipsView
 import kotlinx.android.synthetic.main.activity_query_inspect.refreshLayout
 import kotlinx.android.synthetic.main.activity_query_inspect.searchView
 import kotlinx.android.synthetic.main.activity_query_inspect.startDateView
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 class EventQueryActivity : BaseViewModelActivity<EventQueryViewModel>() {
 
+    private val context: Context = this@EventQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -55,7 +51,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryEvent(
             keywords = keywords,
             startTime = startTime,
@@ -163,42 +159,35 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: EventQueryActivity) : Handler() {
-        private val reference: WeakReference<EventQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210712) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            EventSearchListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.eventRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.eventRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            EventSearchListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent = Intent(resultActivity, EventDetailActivity::class.java)
-                                val rowsBean = resultActivity.dataBeans[position]
-                                intent.putExtra("createTime", rowsBean.createTime)
-                                intent.putExtra(
-                                    "description",
-                                    rowsBean.description!!.filterString()
-                                )
-                                intent.putExtra("data", rowsBean.data)
-                                intent.putExtra("images", rowsBean.images)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210712) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = EventSearchListAdapter(this, dataBeans)
+                    eventRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    eventRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        EventSearchListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, EventDetailActivity::class.java)
+                            val rowsBean = dataBeans[position]
+                            intent.putExtra("createTime", rowsBean.createTime)
+                            intent.putExtra(
+                                "description", rowsBean.description!!.filterString()
+                            )
+                            intent.putExtra("data", rowsBean.data)
+                            intent.putExtra("images", rowsBean.images)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
index 9a23888..ed5b0b4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -11,21 +11,18 @@
 import com.casic.birmm.inspect.base.BaseViewModelActivity
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.InspectListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.InspectionQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_inspect.*
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 
 class InspectionQueryActivity : BaseViewModelActivity<InspectionQueryViewModel>() {
 
+    private val context: Context = this@InspectionQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -49,7 +46,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryInspect(
             keywords = keywords,
             startTime = startTime,
@@ -157,36 +154,29 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: InspectionQueryActivity) : Handler() {
-        private val reference: WeakReference<InspectionQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210709) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            InspectListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.inspectRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.inspectRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            InspectListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent =
-                                    Intent(resultActivity, InspectRouteActivity::class.java)
-                                intent.putExtra("id", resultActivity.dataBeans[position].id)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210709) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = InspectListAdapter(this, dataBeans)
+                    inspectRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    inspectRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        InspectListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, InspectRouteActivity::class.java)
+                            intent.putExtra("id", dataBeans[position].id)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..fb00ab5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/bg_toast_layout.xml" value="0.3703125" />
+        <entry key="app/src/main/res/drawable/ic_add_pic.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_imag_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/layout/activity_big_image.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/activity_event_detail.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_event_list.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.35" />
+        <entry key="app/src/main/res/layout/activity_map.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_new_event.xml" value="0.21481481481481482" />
+        <entry key="app/src/main/res/layout/activity_query_inspect.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/include_base_title.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_big_picture.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/item_image_gridview.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_inspect_recycleview.xml" value="0.2203125" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9d49cae..a40143c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,19 +12,16 @@
             keyPassword '123456789'
         }
     }
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.birmm.inspect"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "2.0.0"
-        ndk {
-            //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
+        ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" }
     }
 
     buildTypes {
@@ -55,10 +52,9 @@
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //腾讯Android UI框架
@@ -69,12 +65,12 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
     //返回值转换器
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
@@ -83,7 +79,7 @@
     implementation 'com.squareup.okhttp3:logging-interceptor:4.6.0'
     //网络请求和接口封装
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     //官方Json解析库
     implementation 'com.google.code.gson:gson:2.8.6'
     //上拉加载下拉刷新
diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
new file mode 100644
index 0000000..00c0d76
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
@@ -0,0 +1,16 @@
+package com.casic.birmm.inspect.utils
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import java.lang.ref.WeakReference
+
+class WeakReferenceHandler(callback: Callback) : Handler(Looper.getMainLooper()) {
+
+    private var weakReference: WeakReference<Callback> = WeakReference(callback)
+
+    override fun handleMessage(msg: Message) {
+        super.handleMessage(msg)
+        weakReference.get()?.handleMessage(msg)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
index 880487a..5a0e996 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -12,26 +12,22 @@
 import com.casic.birmm.inspect.extensions.filterString
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.EventListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.EventQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_event.*
-import kotlinx.android.synthetic.main.activity_query_inspect.emptyView
 import kotlinx.android.synthetic.main.activity_query_inspect.endDateView
 import kotlinx.android.synthetic.main.activity_query_inspect.inputTipsView
 import kotlinx.android.synthetic.main.activity_query_inspect.refreshLayout
 import kotlinx.android.synthetic.main.activity_query_inspect.searchView
 import kotlinx.android.synthetic.main.activity_query_inspect.startDateView
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 class EventQueryActivity : BaseViewModelActivity<EventQueryViewModel>() {
 
+    private val context: Context = this@EventQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -55,7 +51,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryEvent(
             keywords = keywords,
             startTime = startTime,
@@ -163,42 +159,35 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: EventQueryActivity) : Handler() {
-        private val reference: WeakReference<EventQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210712) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            EventSearchListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.eventRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.eventRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            EventSearchListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent = Intent(resultActivity, EventDetailActivity::class.java)
-                                val rowsBean = resultActivity.dataBeans[position]
-                                intent.putExtra("createTime", rowsBean.createTime)
-                                intent.putExtra(
-                                    "description",
-                                    rowsBean.description!!.filterString()
-                                )
-                                intent.putExtra("data", rowsBean.data)
-                                intent.putExtra("images", rowsBean.images)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210712) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = EventSearchListAdapter(this, dataBeans)
+                    eventRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    eventRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        EventSearchListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, EventDetailActivity::class.java)
+                            val rowsBean = dataBeans[position]
+                            intent.putExtra("createTime", rowsBean.createTime)
+                            intent.putExtra(
+                                "description", rowsBean.description!!.filterString()
+                            )
+                            intent.putExtra("data", rowsBean.data)
+                            intent.putExtra("images", rowsBean.images)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
index 9a23888..ed5b0b4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -11,21 +11,18 @@
 import com.casic.birmm.inspect.base.BaseViewModelActivity
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.InspectListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.InspectionQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_inspect.*
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 
 class InspectionQueryActivity : BaseViewModelActivity<InspectionQueryViewModel>() {
 
+    private val context: Context = this@InspectionQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -49,7 +46,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryInspect(
             keywords = keywords,
             startTime = startTime,
@@ -157,36 +154,29 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: InspectionQueryActivity) : Handler() {
-        private val reference: WeakReference<InspectionQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210709) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            InspectListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.inspectRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.inspectRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            InspectListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent =
-                                    Intent(resultActivity, InspectRouteActivity::class.java)
-                                intent.putExtra("id", resultActivity.dataBeans[position].id)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210709) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = InspectListAdapter(this, dataBeans)
+                    inspectRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    inspectRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        InspectListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, InspectRouteActivity::class.java)
+                            intent.putExtra("id", dataBeans[position].id)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
index 0c257fa..61fd9ad 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
@@ -1,10 +1,10 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.casic.birmm.inspect.R
@@ -25,10 +25,10 @@
 import kotlinx.android.synthetic.main.activity_query_inspect.searchView
 import kotlinx.android.synthetic.main.activity_query_inspect.startDateView
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 class SingleModeEventQueryActivity : BaseSingleModeActivity() {
 
+    private val context: Context = this@SingleModeEventQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -51,7 +51,7 @@
     }
 
     override fun initData(savedInstanceState: Bundle?) {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         dataBeans = DataBaseManager.instance.queryAllTaskEvent(pageIndex)
         weakReferenceHandler.sendEmptyMessage(20210820)
     }
@@ -155,45 +155,35 @@
         }
     }
 
-    private class WeakReferenceHandler(activity: SingleModeEventQueryActivity) : Handler() {
-        private val reference: WeakReference<SingleModeEventQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210820) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            EventSearchListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.eventRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.eventRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            EventSearchListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent = Intent(
-                                    resultActivity,
-                                    SingleModeEventDetailActivity::class.java
-                                )
-                                val rowsBean = resultActivity.dataBeans[position]
-                                intent.putExtra("createTime", rowsBean.createTime)
-                                intent.putExtra(
-                                    "description",
-                                    rowsBean.description!!.filterString()
-                                )
-                                intent.putExtra("data", rowsBean.data)
-                                intent.putExtra("images", rowsBean.images)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210820) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = EventSearchListAdapter(this, dataBeans)
+                    eventRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    eventRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        EventSearchListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, SingleModeEventDetailActivity::class.java)
+                            val rowsBean = dataBeans[position]
+                            intent.putExtra("createTime", rowsBean.createTime)
+                            intent.putExtra(
+                                "description", rowsBean.description!!.filterString()
+                            )
+                            intent.putExtra("data", rowsBean.data)
+                            intent.putExtra("images", rowsBean.images)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..fb00ab5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/bg_toast_layout.xml" value="0.3703125" />
+        <entry key="app/src/main/res/drawable/ic_add_pic.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_imag_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/layout/activity_big_image.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/activity_event_detail.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_event_list.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.35" />
+        <entry key="app/src/main/res/layout/activity_map.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_new_event.xml" value="0.21481481481481482" />
+        <entry key="app/src/main/res/layout/activity_query_inspect.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/include_base_title.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_big_picture.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/item_image_gridview.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_inspect_recycleview.xml" value="0.2203125" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9d49cae..a40143c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,19 +12,16 @@
             keyPassword '123456789'
         }
     }
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.birmm.inspect"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "2.0.0"
-        ndk {
-            //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
+        ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" }
     }
 
     buildTypes {
@@ -55,10 +52,9 @@
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //腾讯Android UI框架
@@ -69,12 +65,12 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
     //返回值转换器
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
@@ -83,7 +79,7 @@
     implementation 'com.squareup.okhttp3:logging-interceptor:4.6.0'
     //网络请求和接口封装
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     //官方Json解析库
     implementation 'com.google.code.gson:gson:2.8.6'
     //上拉加载下拉刷新
diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
new file mode 100644
index 0000000..00c0d76
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
@@ -0,0 +1,16 @@
+package com.casic.birmm.inspect.utils
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import java.lang.ref.WeakReference
+
+class WeakReferenceHandler(callback: Callback) : Handler(Looper.getMainLooper()) {
+
+    private var weakReference: WeakReference<Callback> = WeakReference(callback)
+
+    override fun handleMessage(msg: Message) {
+        super.handleMessage(msg)
+        weakReference.get()?.handleMessage(msg)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
index 880487a..5a0e996 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -12,26 +12,22 @@
 import com.casic.birmm.inspect.extensions.filterString
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.EventListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.EventQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_event.*
-import kotlinx.android.synthetic.main.activity_query_inspect.emptyView
 import kotlinx.android.synthetic.main.activity_query_inspect.endDateView
 import kotlinx.android.synthetic.main.activity_query_inspect.inputTipsView
 import kotlinx.android.synthetic.main.activity_query_inspect.refreshLayout
 import kotlinx.android.synthetic.main.activity_query_inspect.searchView
 import kotlinx.android.synthetic.main.activity_query_inspect.startDateView
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 class EventQueryActivity : BaseViewModelActivity<EventQueryViewModel>() {
 
+    private val context: Context = this@EventQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -55,7 +51,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryEvent(
             keywords = keywords,
             startTime = startTime,
@@ -163,42 +159,35 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: EventQueryActivity) : Handler() {
-        private val reference: WeakReference<EventQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210712) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            EventSearchListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.eventRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.eventRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            EventSearchListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent = Intent(resultActivity, EventDetailActivity::class.java)
-                                val rowsBean = resultActivity.dataBeans[position]
-                                intent.putExtra("createTime", rowsBean.createTime)
-                                intent.putExtra(
-                                    "description",
-                                    rowsBean.description!!.filterString()
-                                )
-                                intent.putExtra("data", rowsBean.data)
-                                intent.putExtra("images", rowsBean.images)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210712) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = EventSearchListAdapter(this, dataBeans)
+                    eventRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    eventRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        EventSearchListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, EventDetailActivity::class.java)
+                            val rowsBean = dataBeans[position]
+                            intent.putExtra("createTime", rowsBean.createTime)
+                            intent.putExtra(
+                                "description", rowsBean.description!!.filterString()
+                            )
+                            intent.putExtra("data", rowsBean.data)
+                            intent.putExtra("images", rowsBean.images)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
index 9a23888..ed5b0b4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -11,21 +11,18 @@
 import com.casic.birmm.inspect.base.BaseViewModelActivity
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.InspectListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.InspectionQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_inspect.*
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 
 class InspectionQueryActivity : BaseViewModelActivity<InspectionQueryViewModel>() {
 
+    private val context: Context = this@InspectionQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -49,7 +46,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryInspect(
             keywords = keywords,
             startTime = startTime,
@@ -157,36 +154,29 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: InspectionQueryActivity) : Handler() {
-        private val reference: WeakReference<InspectionQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210709) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            InspectListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.inspectRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.inspectRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            InspectListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent =
-                                    Intent(resultActivity, InspectRouteActivity::class.java)
-                                intent.putExtra("id", resultActivity.dataBeans[position].id)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210709) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = InspectListAdapter(this, dataBeans)
+                    inspectRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    inspectRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        InspectListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, InspectRouteActivity::class.java)
+                            intent.putExtra("id", dataBeans[position].id)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
index 0c257fa..61fd9ad 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
@@ -1,10 +1,10 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.casic.birmm.inspect.R
@@ -25,10 +25,10 @@
 import kotlinx.android.synthetic.main.activity_query_inspect.searchView
 import kotlinx.android.synthetic.main.activity_query_inspect.startDateView
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 class SingleModeEventQueryActivity : BaseSingleModeActivity() {
 
+    private val context: Context = this@SingleModeEventQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -51,7 +51,7 @@
     }
 
     override fun initData(savedInstanceState: Bundle?) {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         dataBeans = DataBaseManager.instance.queryAllTaskEvent(pageIndex)
         weakReferenceHandler.sendEmptyMessage(20210820)
     }
@@ -155,45 +155,35 @@
         }
     }
 
-    private class WeakReferenceHandler(activity: SingleModeEventQueryActivity) : Handler() {
-        private val reference: WeakReference<SingleModeEventQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210820) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            EventSearchListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.eventRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.eventRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            EventSearchListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent = Intent(
-                                    resultActivity,
-                                    SingleModeEventDetailActivity::class.java
-                                )
-                                val rowsBean = resultActivity.dataBeans[position]
-                                intent.putExtra("createTime", rowsBean.createTime)
-                                intent.putExtra(
-                                    "description",
-                                    rowsBean.description!!.filterString()
-                                )
-                                intent.putExtra("data", rowsBean.data)
-                                intent.putExtra("images", rowsBean.images)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210820) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = EventSearchListAdapter(this, dataBeans)
+                    eventRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    eventRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        EventSearchListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, SingleModeEventDetailActivity::class.java)
+                            val rowsBean = dataBeans[position]
+                            intent.putExtra("createTime", rowsBean.createTime)
+                            intent.putExtra(
+                                "description", rowsBean.description!!.filterString()
+                            )
+                            intent.putExtra("data", rowsBean.data)
+                            intent.putExtra("images", rowsBean.images)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt
index d17a827..ce195c1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt
@@ -1,10 +1,10 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.casic.birmm.inspect.R
@@ -18,11 +18,11 @@
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_inspect.*
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 
 class SingleModeInspectionQueryActivity : BaseSingleModeActivity() {
 
+    private val context: Context = this@SingleModeInspectionQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -45,7 +45,7 @@
     }
 
     override fun initData(savedInstanceState: Bundle?) {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         dataBeans = DataBaseManager.instance.queryAllInspection(pageIndex)
         weakReferenceHandler.sendEmptyMessage(20210819)
     }
@@ -151,41 +151,29 @@
         }
     }
 
-    private class WeakReferenceHandler(activity: SingleModeInspectionQueryActivity) : Handler() {
-        private val reference: WeakReference<SingleModeInspectionQueryActivity> =
-            WeakReference(activity)
-
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210819) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            InspectListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.inspectRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.inspectRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            InspectListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent =
-                                    Intent(
-                                        resultActivity,
-                                        SingleModeInspectRouteActivity::class.java
-                                    )
-                                intent.putExtra("id", resultActivity.dataBeans[position].id)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210819) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = InspectListAdapter(this, dataBeans)
+                    inspectRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    inspectRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        InspectListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, SingleModeInspectRouteActivity::class.java)
+                            intent.putExtra("id", dataBeans[position].id)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..fb00ab5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/bg_toast_layout.xml" value="0.3703125" />
+        <entry key="app/src/main/res/drawable/ic_add_pic.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_imag_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/layout/activity_big_image.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/activity_event_detail.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_event_list.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.35" />
+        <entry key="app/src/main/res/layout/activity_map.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_new_event.xml" value="0.21481481481481482" />
+        <entry key="app/src/main/res/layout/activity_query_inspect.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/include_base_title.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_big_picture.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/item_image_gridview.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_inspect_recycleview.xml" value="0.2203125" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9d49cae..a40143c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,19 +12,16 @@
             keyPassword '123456789'
         }
     }
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.birmm.inspect"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "2.0.0"
-        ndk {
-            //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
+        ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" }
     }
 
     buildTypes {
@@ -55,10 +52,9 @@
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //腾讯Android UI框架
@@ -69,12 +65,12 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
     //返回值转换器
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
@@ -83,7 +79,7 @@
     implementation 'com.squareup.okhttp3:logging-interceptor:4.6.0'
     //网络请求和接口封装
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     //官方Json解析库
     implementation 'com.google.code.gson:gson:2.8.6'
     //上拉加载下拉刷新
diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
new file mode 100644
index 0000000..00c0d76
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
@@ -0,0 +1,16 @@
+package com.casic.birmm.inspect.utils
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import java.lang.ref.WeakReference
+
+class WeakReferenceHandler(callback: Callback) : Handler(Looper.getMainLooper()) {
+
+    private var weakReference: WeakReference<Callback> = WeakReference(callback)
+
+    override fun handleMessage(msg: Message) {
+        super.handleMessage(msg)
+        weakReference.get()?.handleMessage(msg)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
index 880487a..5a0e996 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -12,26 +12,22 @@
 import com.casic.birmm.inspect.extensions.filterString
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.EventListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.EventQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_event.*
-import kotlinx.android.synthetic.main.activity_query_inspect.emptyView
 import kotlinx.android.synthetic.main.activity_query_inspect.endDateView
 import kotlinx.android.synthetic.main.activity_query_inspect.inputTipsView
 import kotlinx.android.synthetic.main.activity_query_inspect.refreshLayout
 import kotlinx.android.synthetic.main.activity_query_inspect.searchView
 import kotlinx.android.synthetic.main.activity_query_inspect.startDateView
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 class EventQueryActivity : BaseViewModelActivity<EventQueryViewModel>() {
 
+    private val context: Context = this@EventQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -55,7 +51,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryEvent(
             keywords = keywords,
             startTime = startTime,
@@ -163,42 +159,35 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: EventQueryActivity) : Handler() {
-        private val reference: WeakReference<EventQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210712) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            EventSearchListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.eventRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.eventRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            EventSearchListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent = Intent(resultActivity, EventDetailActivity::class.java)
-                                val rowsBean = resultActivity.dataBeans[position]
-                                intent.putExtra("createTime", rowsBean.createTime)
-                                intent.putExtra(
-                                    "description",
-                                    rowsBean.description!!.filterString()
-                                )
-                                intent.putExtra("data", rowsBean.data)
-                                intent.putExtra("images", rowsBean.images)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210712) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = EventSearchListAdapter(this, dataBeans)
+                    eventRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    eventRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        EventSearchListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, EventDetailActivity::class.java)
+                            val rowsBean = dataBeans[position]
+                            intent.putExtra("createTime", rowsBean.createTime)
+                            intent.putExtra(
+                                "description", rowsBean.description!!.filterString()
+                            )
+                            intent.putExtra("data", rowsBean.data)
+                            intent.putExtra("images", rowsBean.images)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
index 9a23888..ed5b0b4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -11,21 +11,18 @@
 import com.casic.birmm.inspect.base.BaseViewModelActivity
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.InspectListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.InspectionQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_inspect.*
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 
 class InspectionQueryActivity : BaseViewModelActivity<InspectionQueryViewModel>() {
 
+    private val context: Context = this@InspectionQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -49,7 +46,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryInspect(
             keywords = keywords,
             startTime = startTime,
@@ -157,36 +154,29 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: InspectionQueryActivity) : Handler() {
-        private val reference: WeakReference<InspectionQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210709) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            InspectListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.inspectRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.inspectRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            InspectListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent =
-                                    Intent(resultActivity, InspectRouteActivity::class.java)
-                                intent.putExtra("id", resultActivity.dataBeans[position].id)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210709) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = InspectListAdapter(this, dataBeans)
+                    inspectRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    inspectRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        InspectListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, InspectRouteActivity::class.java)
+                            intent.putExtra("id", dataBeans[position].id)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
index 0c257fa..61fd9ad 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
@@ -1,10 +1,10 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.casic.birmm.inspect.R
@@ -25,10 +25,10 @@
 import kotlinx.android.synthetic.main.activity_query_inspect.searchView
 import kotlinx.android.synthetic.main.activity_query_inspect.startDateView
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 class SingleModeEventQueryActivity : BaseSingleModeActivity() {
 
+    private val context: Context = this@SingleModeEventQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -51,7 +51,7 @@
     }
 
     override fun initData(savedInstanceState: Bundle?) {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         dataBeans = DataBaseManager.instance.queryAllTaskEvent(pageIndex)
         weakReferenceHandler.sendEmptyMessage(20210820)
     }
@@ -155,45 +155,35 @@
         }
     }
 
-    private class WeakReferenceHandler(activity: SingleModeEventQueryActivity) : Handler() {
-        private val reference: WeakReference<SingleModeEventQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210820) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            EventSearchListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.eventRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.eventRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            EventSearchListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent = Intent(
-                                    resultActivity,
-                                    SingleModeEventDetailActivity::class.java
-                                )
-                                val rowsBean = resultActivity.dataBeans[position]
-                                intent.putExtra("createTime", rowsBean.createTime)
-                                intent.putExtra(
-                                    "description",
-                                    rowsBean.description!!.filterString()
-                                )
-                                intent.putExtra("data", rowsBean.data)
-                                intent.putExtra("images", rowsBean.images)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210820) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = EventSearchListAdapter(this, dataBeans)
+                    eventRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    eventRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        EventSearchListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, SingleModeEventDetailActivity::class.java)
+                            val rowsBean = dataBeans[position]
+                            intent.putExtra("createTime", rowsBean.createTime)
+                            intent.putExtra(
+                                "description", rowsBean.description!!.filterString()
+                            )
+                            intent.putExtra("data", rowsBean.data)
+                            intent.putExtra("images", rowsBean.images)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt
index d17a827..ce195c1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt
@@ -1,10 +1,10 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.casic.birmm.inspect.R
@@ -18,11 +18,11 @@
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_inspect.*
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 
 class SingleModeInspectionQueryActivity : BaseSingleModeActivity() {
 
+    private val context: Context = this@SingleModeInspectionQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -45,7 +45,7 @@
     }
 
     override fun initData(savedInstanceState: Bundle?) {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         dataBeans = DataBaseManager.instance.queryAllInspection(pageIndex)
         weakReferenceHandler.sendEmptyMessage(20210819)
     }
@@ -151,41 +151,29 @@
         }
     }
 
-    private class WeakReferenceHandler(activity: SingleModeInspectionQueryActivity) : Handler() {
-        private val reference: WeakReference<SingleModeInspectionQueryActivity> =
-            WeakReference(activity)
-
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210819) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            InspectListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.inspectRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.inspectRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            InspectListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent =
-                                    Intent(
-                                        resultActivity,
-                                        SingleModeInspectRouteActivity::class.java
-                                    )
-                                intent.putExtra("id", resultActivity.dataBeans[position].id)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210819) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = InspectListAdapter(this, dataBeans)
+                    inspectRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    inspectRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        InspectListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, SingleModeInspectRouteActivity::class.java)
+                            intent.putExtra("id", dataBeans[position].id)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b2bfc04..2b6e46e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.6.10'
     repositories {
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
         google()
-        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.3'
@@ -23,7 +22,6 @@
         //依赖库
         maven { url 'https://jitpack.io' }
         google()
-        jcenter()
     }
 }
 

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..70c3660
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="inspect_app.app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..b3acfc0
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..fb00ab5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/bg_toast_layout.xml" value="0.3703125" />
+        <entry key="app/src/main/res/drawable/ic_add_pic.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/drawable/ic_load_imag_error.xml" value="0.240625" />
+        <entry key="app/src/main/res/layout/activity_big_image.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/activity_event_detail.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_event_list.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.35" />
+        <entry key="app/src/main/res/layout/activity_map.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/activity_new_event.xml" value="0.21481481481481482" />
+        <entry key="app/src/main/res/layout/activity_query_inspect.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/include_base_title.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_big_picture.xml" value="0.20833333333333334" />
+        <entry key="app/src/main/res/layout/item_image_gridview.xml" value="0.2203125" />
+        <entry key="app/src/main/res/layout/item_inspect_recycleview.xml" value="0.2203125" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9d49cae..a40143c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,19 +12,16 @@
             keyPassword '123456789'
         }
     }
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.casic.birmm.inspect"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "2.0.0"
-        ndk {
-            //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
+        ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" }
     }
 
     buildTypes {
@@ -55,10 +52,9 @@
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //腾讯Android UI框架
@@ -69,12 +65,12 @@
     //fragment快速实现
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
     //MVVM+LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Kotlin协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
     //返回值转换器
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
@@ -83,7 +79,7 @@
     implementation 'com.squareup.okhttp3:logging-interceptor:4.6.0'
     //网络请求和接口封装
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     //官方Json解析库
     implementation 'com.google.code.gson:gson:2.8.6'
     //上拉加载下拉刷新
diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
new file mode 100644
index 0000000..00c0d76
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/utils/WeakReferenceHandler.kt
@@ -0,0 +1,16 @@
+package com.casic.birmm.inspect.utils
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import java.lang.ref.WeakReference
+
+class WeakReferenceHandler(callback: Callback) : Handler(Looper.getMainLooper()) {
+
+    private var weakReference: WeakReference<Callback> = WeakReference(callback)
+
+    override fun handleMessage(msg: Message) {
+        super.handleMessage(msg)
+        weakReference.get()?.handleMessage(msg)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
index 880487a..5a0e996 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -12,26 +12,22 @@
 import com.casic.birmm.inspect.extensions.filterString
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.EventListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.EventQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_event.*
-import kotlinx.android.synthetic.main.activity_query_inspect.emptyView
 import kotlinx.android.synthetic.main.activity_query_inspect.endDateView
 import kotlinx.android.synthetic.main.activity_query_inspect.inputTipsView
 import kotlinx.android.synthetic.main.activity_query_inspect.refreshLayout
 import kotlinx.android.synthetic.main.activity_query_inspect.searchView
 import kotlinx.android.synthetic.main.activity_query_inspect.startDateView
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 class EventQueryActivity : BaseViewModelActivity<EventQueryViewModel>() {
 
+    private val context: Context = this@EventQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -55,7 +51,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryEvent(
             keywords = keywords,
             startTime = startTime,
@@ -163,42 +159,35 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: EventQueryActivity) : Handler() {
-        private val reference: WeakReference<EventQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210712) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            EventSearchListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.eventRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.eventRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            EventSearchListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent = Intent(resultActivity, EventDetailActivity::class.java)
-                                val rowsBean = resultActivity.dataBeans[position]
-                                intent.putExtra("createTime", rowsBean.createTime)
-                                intent.putExtra(
-                                    "description",
-                                    rowsBean.description!!.filterString()
-                                )
-                                intent.putExtra("data", rowsBean.data)
-                                intent.putExtra("images", rowsBean.images)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210712) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = EventSearchListAdapter(this, dataBeans)
+                    eventRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    eventRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        EventSearchListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, EventDetailActivity::class.java)
+                            val rowsBean = dataBeans[position]
+                            intent.putExtra("createTime", rowsBean.createTime)
+                            intent.putExtra(
+                                "description", rowsBean.description!!.filterString()
+                            )
+                            intent.putExtra("data", rowsBean.data)
+                            intent.putExtra("images", rowsBean.images)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
index 9a23888..ed5b0b4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionQueryActivity.kt
@@ -1,8 +1,8 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -11,21 +11,18 @@
 import com.casic.birmm.inspect.base.BaseViewModelActivity
 import com.casic.birmm.inspect.extensions.show
 import com.casic.birmm.inspect.model.InspectListModel
-import com.casic.birmm.inspect.utils.Constant
-import com.casic.birmm.inspect.utils.PageNavigationManager
-import com.casic.birmm.inspect.utils.StatusBarColorUtil
-import com.casic.birmm.inspect.utils.TimeOrDateUtil
+import com.casic.birmm.inspect.utils.*
 import com.casic.birmm.inspect.vm.InspectionQueryViewModel
 import com.gyf.immersionbar.ImmersionBar
 import com.jzxiang.pickerview.TimePickerDialog
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_inspect.*
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 
 class InspectionQueryActivity : BaseViewModelActivity<InspectionQueryViewModel>() {
 
+    private val context: Context = this@InspectionQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -49,7 +46,7 @@
     }
 
     override fun initData() {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         viewModel.queryInspect(
             keywords = keywords,
             startTime = startTime,
@@ -157,36 +154,29 @@
         })
     }
 
-    private class WeakReferenceHandler(activity: InspectionQueryActivity) : Handler() {
-        private val reference: WeakReference<InspectionQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210709) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            InspectListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.inspectRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.inspectRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            InspectListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent =
-                                    Intent(resultActivity, InspectRouteActivity::class.java)
-                                intent.putExtra("id", resultActivity.dataBeans[position].id)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210709) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = InspectListAdapter(this, dataBeans)
+                    inspectRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    inspectRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        InspectListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, InspectRouteActivity::class.java)
+                            intent.putExtra("id", dataBeans[position].id)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
index 0c257fa..61fd9ad 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventQueryActivity.kt
@@ -1,10 +1,10 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.casic.birmm.inspect.R
@@ -25,10 +25,10 @@
 import kotlinx.android.synthetic.main.activity_query_inspect.searchView
 import kotlinx.android.synthetic.main.activity_query_inspect.startDateView
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 class SingleModeEventQueryActivity : BaseSingleModeActivity() {
 
+    private val context: Context = this@SingleModeEventQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -51,7 +51,7 @@
     }
 
     override fun initData(savedInstanceState: Bundle?) {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         dataBeans = DataBaseManager.instance.queryAllTaskEvent(pageIndex)
         weakReferenceHandler.sendEmptyMessage(20210820)
     }
@@ -155,45 +155,35 @@
         }
     }
 
-    private class WeakReferenceHandler(activity: SingleModeEventQueryActivity) : Handler() {
-        private val reference: WeakReference<SingleModeEventQueryActivity> = WeakReference(activity)
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210820) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            EventSearchListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.eventRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.eventRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            EventSearchListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent = Intent(
-                                    resultActivity,
-                                    SingleModeEventDetailActivity::class.java
-                                )
-                                val rowsBean = resultActivity.dataBeans[position]
-                                intent.putExtra("createTime", rowsBean.createTime)
-                                intent.putExtra(
-                                    "description",
-                                    rowsBean.description!!.filterString()
-                                )
-                                intent.putExtra("data", rowsBean.data)
-                                intent.putExtra("images", rowsBean.images)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210820) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = EventSearchListAdapter(this, dataBeans)
+                    eventRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    eventRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        EventSearchListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, SingleModeEventDetailActivity::class.java)
+                            val rowsBean = dataBeans[position]
+                            intent.putExtra("createTime", rowsBean.createTime)
+                            intent.putExtra(
+                                "description", rowsBean.description!!.filterString()
+                            )
+                            intent.putExtra("data", rowsBean.data)
+                            intent.putExtra("images", rowsBean.images)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt
index d17a827..ce195c1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeInspectionQueryActivity.kt
@@ -1,10 +1,10 @@
 package com.casic.birmm.inspect.view
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.os.Handler
-import android.os.Message
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.casic.birmm.inspect.R
@@ -18,11 +18,11 @@
 import com.jzxiang.pickerview.data.Type
 import kotlinx.android.synthetic.main.activity_query_inspect.*
 import kotlinx.android.synthetic.main.include_base_title.*
-import java.lang.ref.WeakReference
 
 
 class SingleModeInspectionQueryActivity : BaseSingleModeActivity() {
 
+    private val context: Context = this@SingleModeInspectionQueryActivity
     private var keywords = ""
     private var startTime = ""
     private var endTime = ""
@@ -45,7 +45,7 @@
     }
 
     override fun initData(savedInstanceState: Bundle?) {
-        weakReferenceHandler = WeakReferenceHandler(this)
+        weakReferenceHandler = WeakReferenceHandler(callback)
         dataBeans = DataBaseManager.instance.queryAllInspection(pageIndex)
         weakReferenceHandler.sendEmptyMessage(20210819)
     }
@@ -151,41 +151,29 @@
         }
     }
 
-    private class WeakReferenceHandler(activity: SingleModeInspectionQueryActivity) : Handler() {
-        private val reference: WeakReference<SingleModeInspectionQueryActivity> =
-            WeakReference(activity)
-
-        override fun handleMessage(msg: Message) {
-            super.handleMessage(msg)
-            val resultActivity = reference.get()
-            if (msg.what == 20210819) {
-                if (resultActivity!!.isRefresh || resultActivity.isLoadMore) {
-                    resultActivity.adapter.notifyDataSetChanged()
-                } else { //首次加载数据
-                    if (resultActivity.dataBeans.size == 0) {
-                        resultActivity.emptyView!!.show("抱歉，无法查询到相关记录", null)
-                    } else {
-                        resultActivity.emptyView!!.hide()
-                        resultActivity.adapter =
-                            InspectListAdapter(resultActivity, resultActivity.dataBeans)
-                        resultActivity.inspectRecyclerView!!.layoutManager =
-                            LinearLayoutManager(resultActivity)
-                        resultActivity.inspectRecyclerView!!.adapter = resultActivity.adapter
-                        resultActivity.adapter.setOnItemClickListener(object :
-                            InspectListAdapter.OnItemClickListener {
-                            override fun onClick(position: Int) {
-                                val intent =
-                                    Intent(
-                                        resultActivity,
-                                        SingleModeInspectRouteActivity::class.java
-                                    )
-                                intent.putExtra("id", resultActivity.dataBeans[position].id)
-                                resultActivity.startActivity(intent)
-                            }
-                        })
-                    }
+    private val callback = Handler.Callback {
+        if (it.what == 20210819) {
+            if (isRefresh || isLoadMore) {
+                adapter.notifyDataSetChanged()
+            } else { //首次加载数据
+                if (dataBeans.size == 0) {
+                    emptyView!!.show("抱歉，无法查询到相关记录", null)
+                } else {
+                    emptyView!!.hide()
+                    adapter = InspectListAdapter(this, dataBeans)
+                    inspectRecyclerView!!.layoutManager = LinearLayoutManager(this)
+                    inspectRecyclerView!!.adapter = adapter
+                    adapter.setOnItemClickListener(object :
+                        InspectListAdapter.OnItemClickListener {
+                        override fun onClick(position: Int) {
+                            val intent = Intent(context, SingleModeInspectRouteActivity::class.java)
+                            intent.putExtra("id", dataBeans[position].id)
+                            startActivity(intent)
+                        }
+                    })
                 }
             }
         }
+        true
     }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b2bfc04..2b6e46e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.6.10'
     repositories {
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
         google()
-        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.3'
@@ -23,7 +22,6 @@
         //依赖库
         maven { url 'https://jitpack.io' }
         google()
-        jcenter()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c4d16d..97cfa74 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip